From 23a3289c9a6f3848cb91631337854d2843d82456 Mon Sep 17 00:00:00 2001
From: Vegard Gulaker <vegard.gulaker@nordicsemi.no>
Date: Thu, 25 Sep 2025 08:33:42 +0200
Subject: [PATCH 1/8] bluetooth: hci_driver: Prepare for new sdc_support_* API

The sdc_support_* functions will soon be updated to return void.

This is a temporary change to support both APIs until the new
SDC support API has made its way to nrfxlib.

Signed-off-by: Vegard Gulaker <vegard.gulaker@nordicsemi.no>
---
 subsys/bluetooth/controller/hci_driver.c | 209 ++++++++++++++++++++++-
 1 file changed, 208 insertions(+), 1 deletion(-)

diff --git a/subsys/bluetooth/controller/hci_driver.c b/subsys/bluetooth/controller/hci_driver.c
index 67f9e07b39f7..239d3a77d2ae 100644
--- a/subsys/bluetooth/controller/hci_driver.c
+++ b/subsys/bluetooth/controller/hci_driver.c
@@ -712,326 +712,511 @@ static void rand_prio_low_vector_get_blocking(uint8_t *p_buff, uint8_t length)
 
 static int configure_supported_features(void)
 {
+#if !defined(SDC_USE_NEW_SDC_SUPPORT_API)
 	int err;
+#endif
 
 #if defined(CONFIG_BT_BROADCASTER)
 	if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_ext_adv();
+#else
 		err = sdc_support_ext_adv();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	} else {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_adv();
+#else
 		err = sdc_support_adv();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 #endif
 
 	if (IS_ENABLED(CONFIG_BT_PER_ADV)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_periodic_adv();
+#else
 		err = sdc_support_le_periodic_adv();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_peripheral();
+#else
 		err = sdc_support_peripheral();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_OBSERVER)) {
 		if (!IS_ENABLED(CONFIG_BT_CENTRAL)) {
 			if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+				sdc_support_ext_scan();
+#else
 				err = sdc_support_ext_scan();
 				if (err) {
 					return -ENOTSUP;
 				}
+#endif
 			} else {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+				sdc_support_scan();
+#else
 				err = sdc_support_scan();
 				if (err) {
 					return -ENOTSUP;
-				}
+}
+#endif
 			}
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_le_periodic_sync();
+#else
 			err = sdc_support_le_periodic_sync();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
 		if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_ext_central();
+#else
 			err = sdc_support_ext_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		} else {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_central();
+#else
 			err = sdc_support_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DATA_LENGTH)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_dle_central();
+#else
 			err = sdc_support_dle_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_dle_peripheral();
+#else
 			err = sdc_support_dle_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PHY_2M)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_2m_phy();
+#else
 		err = sdc_support_le_2m_phy();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_phy_update_central();
+#else
 			err = sdc_support_phy_update_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_phy_update_peripheral();
+#else
 			err = sdc_support_phy_update_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_periodic_adv_sync_transfer_sender_central();
+#else
 			err = sdc_support_periodic_adv_sync_transfer_sender_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_periodic_adv_sync_transfer_sender_peripheral();
+#else
 			err = sdc_support_periodic_adv_sync_transfer_sender_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_periodic_adv_sync_transfer_receiver_central();
+#else
 			err = sdc_support_periodic_adv_sync_transfer_receiver_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_periodic_adv_sync_transfer_receiver_peripheral();
+#else
 			err = sdc_support_periodic_adv_sync_transfer_receiver_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_coded_phy();
+#else
 		err = sdc_support_le_coded_phy();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_phy_update_central();
+#else
 			err = sdc_support_phy_update_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_phy_update_peripheral();
+#else
 			err = sdc_support_phy_update_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DF_CONN_CTE_RSP) && IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_conn_cte_rsp_central();
+#else
 		err = sdc_support_le_conn_cte_rsp_central();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DF_CONN_CTE_RSP) && IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_conn_cte_rsp_peripheral();
+#else
 		err = sdc_support_le_conn_cte_rsp_peripheral();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DF_ADV_CTE_TX)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_connectionless_cte_transmitter();
+#else
 		err = sdc_support_le_connectionless_cte_transmitter();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LE_POWER_CONTROL)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_le_power_control_central();
+#else
 			err = sdc_support_le_power_control_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_le_power_control_peripheral();
+#else
 			err = sdc_support_le_power_control_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_CTLR_LE_PATH_LOSS_MONITORING)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_le_path_loss_monitoring();
+#else
 			err = sdc_support_le_path_loss_monitoring();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SCA_UPDATE)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_sca_central();
+#else
 			err = sdc_support_sca_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_sca_peripheral();
+#else
 			err = sdc_support_sca_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_QOS_CHANNEL_SURVEY)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_qos_channel_survey();
+#else
 		err = sdc_support_qos_channel_survey();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_PAWR_ADV)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_periodic_adv_with_rsp();
+#else
 		err = sdc_support_le_periodic_adv_with_rsp();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_PAWR_SYNC)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_periodic_sync_with_rsp();
+#else
 		err = sdc_support_le_periodic_sync_with_rsp();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PERIPHERAL_ISO)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_cis_peripheral();
+#else
 		err = sdc_support_cis_peripheral();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_CENTRAL_ISO)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_cis_central();
+#else
 		err = sdc_support_cis_central();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_ADV_ISO)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_bis_source();
+#else
 		err = sdc_support_bis_source();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_IGNORE_HCI_ISO_DATA_TS_FROM_HOST)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_iso_host_timestamps_ignore(true);
+#else
 		err = sdc_iso_host_timestamps_ignore(true);
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_bis_sink();
+#else
 		err = sdc_support_bis_sink();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 #if defined(CONFIG_BT_CTLR_SDC_ALLOW_PARALLEL_SCANNING_AND_INITIATING)
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+	sdc_support_parallel_scanning_and_initiating();
+#else
 	err = sdc_support_parallel_scanning_and_initiating();
 	if (err) {
 		return -ENOTSUP;
 	}
+#endif
 #endif
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SUBRATING)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_connection_subrating_central();
+#else
 			err = sdc_support_connection_subrating_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_connection_subrating_peripheral();
+#else
 			err = sdc_support_connection_subrating_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_frame_space_update_central();
+#else
 			err = sdc_support_frame_space_update_central();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+			sdc_support_frame_space_update_peripheral();
+#else
 			err = sdc_support_frame_space_update_peripheral();
 			if (err) {
 				return -ENOTSUP;
 			}
+#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_extended_feature_set();
+#else
 		err = sdc_support_extended_feature_set();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_CHANNEL_SOUNDING_TEST)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_channel_sounding_test();
+#else
 		err = sdc_support_channel_sounding_test();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_CHANNEL_SOUNDING)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_channel_sounding();
+#if defined(CONFIG_BT_CTLR_SDC_CS_MULTIPLE_ANTENNA_SUPPORT)
+		sdc_cs_antenna_switch_callback_set(cs_antenna_switch_func);
+		cs_antenna_switch_init();
+#endif
+#else
 #if defined(CONFIG_BT_CTLR_SDC_CS_MULTIPLE_ANTENNA_SUPPORT)
 		err = sdc_support_channel_sounding(cs_antenna_switch_func);
 		cs_antenna_switch_init();
@@ -1041,43 +1226,65 @@ static int configure_supported_features(void)
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_STEP_MODE3)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_channel_sounding_mode3();
+#else
 		err = sdc_support_channel_sounding_mode3();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_INITIATOR_ONLY) ||
 		IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_BOTH)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_channel_sounding_initiator_role();
+#else
 		err = sdc_support_channel_sounding_initiator_role();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_REFLECTOR_ONLY) ||
 		IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_BOTH)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_channel_sounding_reflector_role();
+#else
 		err = sdc_support_channel_sounding_reflector_role();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_LE_POWER_CLASS_1)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_power_class_1();
+#else
 		err = sdc_support_le_power_class_1();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
+
 	if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY)) {
+#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
+		sdc_support_le_privacy();
+#else
 		err = sdc_support_le_privacy();
 		if (err) {
 			return -ENOTSUP;
 		}
+#endif
 	}
 
 	return 0;

From db2de7a803ce9f7decae609eea1242fe569c4015 Mon Sep 17 00:00:00 2001
From: Vegard Gulaker <vegard.gulaker@nordicsemi.no>
Date: Wed, 1 Oct 2025 10:12:22 +0200
Subject: [PATCH 2/8] bluetooth: hci-driver: Remove temporary defines

SDC_USE_NEW_SDC_SUPPORT_API:
The sdc_support_* API that returns void is now in use in nrfxlib.
So there is no need to support the old API.

SDC_USE_NEW_MEM_API:
This was added in d53b1554dbce7f3695b4d193c2ef36c39063fb7b and should
have been removed a long time ago.

Signed-off-by: Vegard Gulaker <vegard.gulaker@nordicsemi.no>
---
 subsys/bluetooth/controller/hci_driver.c | 370 +----------------------
 1 file changed, 2 insertions(+), 368 deletions(-)

diff --git a/subsys/bluetooth/controller/hci_driver.c b/subsys/bluetooth/controller/hci_driver.c
index 239d3a77d2ae..fcce2a1e04e9 100644
--- a/subsys/bluetooth/controller/hci_driver.c
+++ b/subsys/bluetooth/controller/hci_driver.c
@@ -19,7 +19,6 @@
 #include <stdbool.h>
 #include <zephyr/sys/__assert.h>
 
-#define SDC_USE_NEW_MEM_API
 #include <sdc.h>
 #include <sdc_soc.h>
 #include <sdc_hci.h>
@@ -710,584 +709,222 @@ static void rand_prio_low_vector_get_blocking(uint8_t *p_buff, uint8_t length)
 	(void) err;
 }
 
-static int configure_supported_features(void)
+static void configure_supported_features(void)
 {
-#if !defined(SDC_USE_NEW_SDC_SUPPORT_API)
-	int err;
-#endif
-
 #if defined(CONFIG_BT_BROADCASTER)
 	if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_ext_adv();
-#else
-		err = sdc_support_ext_adv();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	} else {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_adv();
-#else
-		err = sdc_support_adv();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 #endif
 
 	if (IS_ENABLED(CONFIG_BT_PER_ADV)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_periodic_adv();
-#else
-		err = sdc_support_le_periodic_adv();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_peripheral();
-#else
-		err = sdc_support_peripheral();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_OBSERVER)) {
 		if (!IS_ENABLED(CONFIG_BT_CENTRAL)) {
 			if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 				sdc_support_ext_scan();
-#else
-				err = sdc_support_ext_scan();
-				if (err) {
-					return -ENOTSUP;
-				}
-#endif
 			} else {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 				sdc_support_scan();
-#else
-				err = sdc_support_scan();
-				if (err) {
-					return -ENOTSUP;
-}
-#endif
 			}
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_le_periodic_sync();
-#else
-			err = sdc_support_le_periodic_sync();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
 		if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_ext_central();
-#else
-			err = sdc_support_ext_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		} else {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_central();
-#else
-			err = sdc_support_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DATA_LENGTH)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_dle_central();
-#else
-			err = sdc_support_dle_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_dle_peripheral();
-#else
-			err = sdc_support_dle_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PHY_2M)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_2m_phy();
-#else
-		err = sdc_support_le_2m_phy();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_phy_update_central();
-#else
-			err = sdc_support_phy_update_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_phy_update_peripheral();
-#else
-			err = sdc_support_phy_update_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_periodic_adv_sync_transfer_sender_central();
-#else
-			err = sdc_support_periodic_adv_sync_transfer_sender_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_periodic_adv_sync_transfer_sender_peripheral();
-#else
-			err = sdc_support_periodic_adv_sync_transfer_sender_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_periodic_adv_sync_transfer_receiver_central();
-#else
-			err = sdc_support_periodic_adv_sync_transfer_receiver_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_periodic_adv_sync_transfer_receiver_peripheral();
-#else
-			err = sdc_support_periodic_adv_sync_transfer_receiver_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_coded_phy();
-#else
-		err = sdc_support_le_coded_phy();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_phy_update_central();
-#else
-			err = sdc_support_phy_update_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_phy_update_peripheral();
-#else
-			err = sdc_support_phy_update_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DF_CONN_CTE_RSP) && IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_conn_cte_rsp_central();
-#else
-		err = sdc_support_le_conn_cte_rsp_central();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DF_CONN_CTE_RSP) && IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_conn_cte_rsp_peripheral();
-#else
-		err = sdc_support_le_conn_cte_rsp_peripheral();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_DF_ADV_CTE_TX)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_connectionless_cte_transmitter();
-#else
-		err = sdc_support_le_connectionless_cte_transmitter();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LE_POWER_CONTROL)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_le_power_control_central();
-#else
-			err = sdc_support_le_power_control_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_le_power_control_peripheral();
-#else
-			err = sdc_support_le_power_control_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_CTLR_LE_PATH_LOSS_MONITORING)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_le_path_loss_monitoring();
-#else
-			err = sdc_support_le_path_loss_monitoring();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SCA_UPDATE)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_sca_central();
-#else
-			err = sdc_support_sca_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_sca_peripheral();
-#else
-			err = sdc_support_sca_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_QOS_CHANNEL_SURVEY)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_qos_channel_survey();
-#else
-		err = sdc_support_qos_channel_survey();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_PAWR_ADV)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_periodic_adv_with_rsp();
-#else
-		err = sdc_support_le_periodic_adv_with_rsp();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_PAWR_SYNC)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_periodic_sync_with_rsp();
-#else
-		err = sdc_support_le_periodic_sync_with_rsp();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PERIPHERAL_ISO)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_cis_peripheral();
-#else
-		err = sdc_support_cis_peripheral();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_CENTRAL_ISO)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_cis_central();
-#else
-		err = sdc_support_cis_central();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_ADV_ISO)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_bis_source();
-#else
-		err = sdc_support_bis_source();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_IGNORE_HCI_ISO_DATA_TS_FROM_HOST)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_iso_host_timestamps_ignore(true);
-#else
-		err = sdc_iso_host_timestamps_ignore(true);
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_bis_sink();
-#else
-		err = sdc_support_bis_sink();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 #if defined(CONFIG_BT_CTLR_SDC_ALLOW_PARALLEL_SCANNING_AND_INITIATING)
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 	sdc_support_parallel_scanning_and_initiating();
-#else
-	err = sdc_support_parallel_scanning_and_initiating();
-	if (err) {
-		return -ENOTSUP;
-	}
-#endif
 #endif
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SUBRATING)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_connection_subrating_central();
-#else
-			err = sdc_support_connection_subrating_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_connection_subrating_peripheral();
-#else
-			err = sdc_support_connection_subrating_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)) {
 		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_frame_space_update_central();
-#else
-			err = sdc_support_frame_space_update_central();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 			sdc_support_frame_space_update_peripheral();
-#else
-			err = sdc_support_frame_space_update_peripheral();
-			if (err) {
-				return -ENOTSUP;
-			}
-#endif
 		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_extended_feature_set();
-#else
-		err = sdc_support_extended_feature_set();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_CHANNEL_SOUNDING_TEST)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_channel_sounding_test();
-#else
-		err = sdc_support_channel_sounding_test();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_CHANNEL_SOUNDING)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_channel_sounding();
 #if defined(CONFIG_BT_CTLR_SDC_CS_MULTIPLE_ANTENNA_SUPPORT)
 		sdc_cs_antenna_switch_callback_set(cs_antenna_switch_func);
 		cs_antenna_switch_init();
-#endif
-#else
-#if defined(CONFIG_BT_CTLR_SDC_CS_MULTIPLE_ANTENNA_SUPPORT)
-		err = sdc_support_channel_sounding(cs_antenna_switch_func);
-		cs_antenna_switch_init();
-#else
-		err = sdc_support_channel_sounding(NULL);
-#endif
-		if (err) {
-			return -ENOTSUP;
-		}
 #endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_STEP_MODE3)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_channel_sounding_mode3();
-#else
-		err = sdc_support_channel_sounding_mode3();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_INITIATOR_ONLY) ||
 		IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_BOTH)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_channel_sounding_initiator_role();
-#else
-		err = sdc_support_channel_sounding_initiator_role();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_REFLECTOR_ONLY) ||
 		IS_ENABLED(CONFIG_BT_CTLR_SDC_CS_ROLE_BOTH)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_channel_sounding_reflector_role();
-#else
-		err = sdc_support_channel_sounding_reflector_role();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_SDC_LE_POWER_CLASS_1)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_power_class_1();
-#else
-		err = sdc_support_le_power_class_1();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
 
-
 	if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY)) {
-#if defined(SDC_USE_NEW_SDC_SUPPORT_API)
 		sdc_support_le_privacy();
-#else
-		err = sdc_support_le_privacy();
-		if (err) {
-			return -ENOTSUP;
-		}
-#endif
 	}
-
-	return 0;
 }
 
 static int configure_memory_usage(void)
@@ -1825,10 +1462,7 @@ static int hci_driver_init(const struct device *dev)
 		return err;
 	}
 
-	err = configure_supported_features();
-	if (err) {
-		return err;
-	}
+	configure_supported_features();
 
 	err = configure_memory_usage();
 	if (err) {

From f3a5d774174503f42e6001067f1f4f67757d8c47 Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Mon, 29 Sep 2025 12:06:06 +0200
Subject: [PATCH 3/8] mpsl: Remove call to unecessary call to mpsl_pan_rfu

This API call is no longer needed. It has been a no-op
for a long period of time.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
---
 subsys/mpsl/init/mpsl_init.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/subsys/mpsl/init/mpsl_init.c b/subsys/mpsl/init/mpsl_init.c
index c3cb98f4b5ce..862795b58bd5 100644
--- a/subsys/mpsl/init/mpsl_init.c
+++ b/subsys/mpsl/init/mpsl_init.c
@@ -432,10 +432,6 @@ static int32_t mpsl_lib_init_internal(void)
 	mpsl_clock_hfclk_latency_set(CONFIG_MPSL_HFCLK_LATENCY);
 #endif /* CONFIG_CLOCK_CONTROL_NRF && DT_NODE_EXISTS(DT_NODELABEL(hfxo)) */
 #endif /* !CONFIG_MPSL_USE_EXTERNAL_CLOCK_CONTROL */
-	if (IS_ENABLED(CONFIG_SOC_NRF_FORCE_CONSTLAT) &&
-		!IS_ENABLED(CONFIG_SOC_COMPATIBLE_NRF54LX)) {
-		mpsl_pan_rfu();
-	}
 
 #if MPSL_TIMESLOT_SESSION_COUNT > 0
 	err = mpsl_timeslot_session_count_set((void *) timeslot_context,

From 83c827893a594e01b09b454cb199df03ca8e0b32 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 2 Oct 2025 16:14:14 +0200
Subject: [PATCH 4/8] manifest: update sdk-zephyr, nrfx and nrfxlib

With changes in include paths.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 west.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/west.yml b/west.yml
index 80c46100bc5f..62ef58d91c1d 100644
--- a/west.yml
+++ b/west.yml
@@ -66,7 +66,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 079d80388a6240f572442ce7021f1aab31a56139
+      revision: pull/3355/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -146,7 +146,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: 94ffaf29bf10ebb934907d3b87f82239678fb91a
+      revision: pull/1878/head
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m
@@ -280,7 +280,7 @@ manifest:
       path: nrfx
       groups:
         - nrfx
-      revision: 7ed74ac12ab94f561af820da8fb7089a0323e6de
+      revision: pull/977/head
 
   # West-related configuration for the nrf repository.
   self:

From 0476a0c25140170775c303af12dff29a90b7f9f1 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 2 Oct 2025 16:32:58 +0200
Subject: [PATCH 5/8] treewide: align to modified include paths in nrfx

Include nrfx instead of MDK.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 boards/nordic/nrf7120pdk/board.c                              | 3 +--
 include/bl_storage.h                                          | 2 +-
 include/drivers/gpio/hpf_gpio.h                               | 2 +-
 include/esb.h                                                 | 2 +-
 include/tfm/tfm_builtin_key_ids.h                             | 2 +-
 lib/fem_al/fem_al.c                                           | 2 +-
 lib/flash_patch/flash_patch.c                                 | 2 +-
 lib/fprotect/fprotect_bprot.c                                 | 2 +-
 lib/fprotect/fprotect_rram.c                                  | 2 +-
 lib/fprotect/fprotect_spu.c                                   | 2 +-
 lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c                   | 1 -
 lib/nrf_modem_lib/nrf_modem_os.c                              | 2 +-
 modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c  | 2 +-
 modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h      | 2 +-
 .../services/include/tfm_platform_user_memory_ranges.h        | 2 +-
 .../trusted-firmware-m/tfm_boards/src/log_memory_protection.c | 3 +--
 samples/benchmarks/coremark/src/main.c                        | 2 +-
 samples/bluetooth/direct_test_mode/src/dtm.c                  | 1 -
 samples/bluetooth/direct_test_mode/src/dtm_hw.c               | 2 +-
 samples/crypto/psa_tls/src/main.c                             | 2 +-
 .../psa_tls/src/non-secure/psa_tls_credentials_client.c       | 2 +-
 .../psa_tls/src/non-secure/psa_tls_credentials_server.c       | 2 +-
 samples/crypto/psa_tls/src/psa_dtls_functions_client.c        | 2 +-
 samples/crypto/psa_tls/src/psa_dtls_functions_server.c        | 2 +-
 samples/crypto/psa_tls/src/psa_tls_common.c                   | 2 +-
 samples/crypto/psa_tls/src/psa_tls_functions_client.c         | 2 +-
 samples/crypto/psa_tls/src/psa_tls_functions_server.c         | 2 +-
 .../crypto/psa_tls/src/secure/psa_tls_credentials_client.c    | 2 +-
 .../crypto/psa_tls/src/secure/psa_tls_credentials_server.c    | 2 +-
 samples/esb/esb_monitor/src/main.c                            | 3 +--
 samples/esb/esb_prx/src/main.c                                | 3 +--
 samples/esb/esb_ptx/src/main.c                                | 3 +--
 samples/nrf5340/empty_app_core/README.rst                     | 1 -
 samples/nrf5340/empty_app_core/src/main.c                     | 1 -
 samples/peripheral/radio_test/src/main.c                      | 2 +-
 samples/peripheral/radio_test/src/radio_test.c                | 1 -
 soc/nordic/nrf71/soc.c                                        | 4 ++--
 subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c          | 2 +-
 subsys/bootloader/bl_storage/bl_storage.c                     | 2 +-
 subsys/esb/esb.c                                              | 3 +--
 subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c                      | 1 +
 subsys/nfc/lib/platform.c                                     | 2 --
 .../src/drivers/cracen/common/include/security/cracen.h       | 2 +-
 .../nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c   | 2 +-
 subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h    | 2 +-
 45 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/boards/nordic/nrf7120pdk/board.c b/boards/nordic/nrf7120pdk/board.c
index 8c05c8b739e3..6f0e9f7cac6c 100644
--- a/boards/nordic/nrf7120pdk/board.c
+++ b/boards/nordic/nrf7120pdk/board.c
@@ -6,8 +6,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/platform/hooks.h>
-#include "nrf7120_enga_types.h"
-#include "nrf7120_enga_global.h"
+#include <nrfx.h>
 
 #if CONFIG_BOARD_EARLY_INIT_HOOK
 /* Temporary workaround while VPR does not handle starting clocks */
diff --git a/include/bl_storage.h b/include/bl_storage.h
index 7da0bc46fcb1..890b8639a7b3 100644
--- a/include/bl_storage.h
+++ b/include/bl_storage.h
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <zephyr/autoconf.h>
-#include <drivers/nrfx_common.h>
+#include <nrfx.h>
 #if defined(CONFIG_NRFX_NVMC)
 #include <nrfx_nvmc.h>
 #elif defined(CONFIG_NRFX_RRAMC)
diff --git a/include/drivers/gpio/hpf_gpio.h b/include/drivers/gpio/hpf_gpio.h
index 2f16d27ef689..c90a873909c9 100644
--- a/include/drivers/gpio/hpf_gpio.h
+++ b/include/drivers/gpio/hpf_gpio.h
@@ -7,7 +7,7 @@
 #ifndef HPF_GPIO_H
 #define HPF_GPIO_H
 
-#include <drivers/nrfx_common.h>
+#include <nrfx.h>
 #include <hpf/hpf_common.h>
 
 #ifdef __cplusplus
diff --git a/include/esb.h b/include/esb.h
index 02d6fa5fc10e..7b033d105be1 100644
--- a/include/esb.h
+++ b/include/esb.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_radio.h>
 
 #include <zephyr/sys/util.h>
diff --git a/include/tfm/tfm_builtin_key_ids.h b/include/tfm/tfm_builtin_key_ids.h
index ce91be778eff..1653a348162c 100644
--- a/include/tfm/tfm_builtin_key_ids.h
+++ b/include/tfm/tfm_builtin_key_ids.h
@@ -7,7 +7,7 @@
 #ifndef __TFM_BUILTIN_KEY_IDS_H__
 #define __TFM_BUILTIN_KEY_IDS_H__
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #if defined(NRF_CRACENCORE) || defined(CONFIG_CRACEN_HW_PRESENT)
 
diff --git a/lib/fem_al/fem_al.c b/lib/fem_al/fem_al.c
index eecce4f635b3..719430348bea 100644
--- a/lib/fem_al/fem_al.c
+++ b/lib/fem_al/fem_al.c
@@ -12,7 +12,7 @@
 #ifdef DPPI_PRESENT
 #include <nrfx_dppi.h>
 #endif
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 #include <zephyr/sys/printk.h>
 
diff --git a/lib/flash_patch/flash_patch.c b/lib/flash_patch/flash_patch.c
index c6b97a402f9f..6756b89b6429 100644
--- a/lib/flash_patch/flash_patch.c
+++ b/lib/flash_patch/flash_patch.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/init.h>
 
diff --git a/lib/fprotect/fprotect_bprot.c b/lib/fprotect/fprotect_bprot.c
index cf20be2c2b1b..dc65fbc177d6 100644
--- a/lib/fprotect/fprotect_bprot.c
+++ b/lib/fprotect/fprotect_bprot.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #if defined(NRF_BPROT)
 	#include <hal/nrf_bprot.h>
 	#define PROTECT nrf_bprot_nvm_blocks_protection_enable
diff --git a/lib/fprotect/fprotect_rram.c b/lib/fprotect/fprotect_rram.c
index dbc9ce4a7e2e..1c85c9825968 100644
--- a/lib/fprotect/fprotect_rram.c
+++ b/lib/fprotect/fprotect_rram.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <soc.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #include <hal/nrf_rramc.h>
 
 #define RRAMC_REGION_FOR_FPROTECT_DEFAULT_VALUE 0x0000000f
diff --git a/lib/fprotect/fprotect_spu.c b/lib/fprotect/fprotect_spu.c
index d2aafd5b9c9c..7f8429648151 100644
--- a/lib/fprotect/fprotect_spu.c
+++ b/lib/fprotect/fprotect_spu.c
@@ -9,7 +9,7 @@
 #include <hal/nrf_spu.h>
 #include <errno.h>
 #include <soc.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 
 #define SPU_BLOCK_SIZE CONFIG_FPROTECT_BLOCK_SIZE
diff --git a/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c b/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
index 3eb74cf9da6b..41da5f0921ab 100644
--- a/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
+++ b/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
@@ -11,7 +11,6 @@
 #include <nrfx.h>
 #include <nrfx_nvmc.h>
 
-#include <mdk/nrf_erratas.h>
 #include <zephyr/logging/log.h>
 
 #define KMU_KEYSLOT_SIZE_WORDS 4
diff --git a/lib/nrf_modem_lib/nrf_modem_os.c b/lib/nrf_modem_lib/nrf_modem_os.c
index 7c76cc750f39..9db7796a6854 100644
--- a/lib/nrf_modem_lib/nrf_modem_os.c
+++ b/lib/nrf_modem_lib/nrf_modem_os.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <nrf_modem.h>
 #include <nrf_modem_os.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_errno.h>
 #include <errno.h>
 
diff --git a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
index 79bf80cdf6b8..69e07fbce967 100644
--- a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
+++ b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "nrf.h"
+#include "nrfx.h"
 #include "hal/nrf_timer.h"
 
 #include "nrf_802154_sl_periphs.h"
diff --git a/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h b/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
index 72211f035232..0994854ec2ee 100644
--- a/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
+++ b/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
@@ -15,7 +15,7 @@
 
 #include <nrf-pinctrl.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #define UART_PIN_INIT(node_id, prop, idx) DT_PROP_BY_IDX(node_id, prop, idx),
 
diff --git a/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h b/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
index e0111102f28c..465ffddc4340 100644
--- a/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
+++ b/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
@@ -11,7 +11,7 @@
 
 #include <tfm_ioctl_core_api.h>
 
-#include "nrf.h"
+#include "nrfx.h"
 
 /*
  * On platforms like nrf53 we provide a service for reading out
diff --git a/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c b/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
index 86de76a1bc16..5122f9d6a2da 100644
--- a/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
+++ b/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
@@ -7,8 +7,7 @@
 #include <cmsis.h>
 #include <tfm_spm_log.h>
 #include <mpu_armv8m_drv.h>
-#include <nrf.h>
-#include <nrf_peripherals.h>
+#include <nrfx.h>
 #include <array.h>
 #include <nrfx_nvmc.h>
 
diff --git a/samples/benchmarks/coremark/src/main.c b/samples/benchmarks/coremark/src/main.c
index f75374b45271..2374087f47a3 100644
--- a/samples/benchmarks/coremark/src/main.c
+++ b/samples/benchmarks/coremark/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/misc/coresight/nrf_etr.h>
-#include <system_nrf.h>
+#include <nrfx.h>
 
 #include "coremark_zephyr.h"
 
diff --git a/samples/bluetooth/direct_test_mode/src/dtm.c b/samples/bluetooth/direct_test_mode/src/dtm.c
index ba5d728e48a2..79ce90ce6bc8 100644
--- a/samples/bluetooth/direct_test_mode/src/dtm.c
+++ b/samples/bluetooth/direct_test_mode/src/dtm.c
@@ -37,7 +37,6 @@
 #include <helpers/nrfx_gppi.h>
 #include <nrfx_timer.h>
 
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/bluetooth/direct_test_mode/src/dtm_hw.c b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
index 85dec3b5c324..ecabe4bb20da 100644
--- a/samples/bluetooth/direct_test_mode/src/dtm_hw.c
+++ b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include "nrf.h"
+#include "nrfx.h"
 
 #include "dtm_hw.h"
 #include "dtm_hw_config.h"
diff --git a/samples/crypto/psa_tls/src/main.c b/samples/crypto/psa_tls/src/main.c
index e9b4f64595f0..882db46708de 100644
--- a/samples/crypto/psa_tls/src/main.c
+++ b/samples/crypto/psa_tls/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
index 7e8632895301..f3e4ede373de 100644
--- a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
+++ b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_client_non_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
index 8397231cea95..6867710ee50b 100644
--- a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
+++ b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_server_non_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_dtls_functions_client.c b/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
index 6a4c40d4c77b..167777717d4b 100644
--- a/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
+++ b/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_dtls_client);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_dtls_functions_server.c b/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
index 59fe44f4fb3d..58e938f6ea25 100644
--- a/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
+++ b/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_dtls_server);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_common.c b/samples/crypto/psa_tls/src/psa_tls_common.c
index 5beeaec059e9..bffd2da414f4 100644
--- a/samples/crypto/psa_tls/src/psa_tls_common.c
+++ b/samples/crypto/psa_tls/src/psa_tls_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_client.c b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
index bf003656d52f..ee8b8031c3db 100644
--- a/samples/crypto/psa_tls/src/psa_tls_functions_client.c
+++ b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_client);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_server.c b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
index e0a556f1e5c3..3ea0030cd467 100644
--- a/samples/crypto/psa_tls/src/psa_tls_functions_server.c
+++ b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_server);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
index 3f4a1b9a03c6..d7c7255130a0 100644
--- a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
+++ b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_client_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
index 24a14b9ca901..f1b77f4da9dd 100644
--- a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
+++ b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_server_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/esb/esb_monitor/src/main.c b/samples/esb/esb_monitor/src/main.c
index c2b1c841a1f2..ddd2c314cc87 100644
--- a/samples/esb/esb_monitor/src/main.c
+++ b/samples/esb/esb_monitor/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/esb/esb_prx/src/main.c b/samples/esb/esb_prx/src/main.c
index 7e74e9ecb580..89d9cc361ec0 100644
--- a/samples/esb/esb_prx/src/main.c
+++ b/samples/esb/esb_prx/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/esb/esb_ptx/src/main.c b/samples/esb/esb_ptx/src/main.c
index b5ad74c363a4..fcb51ae3817e 100644
--- a/samples/esb/esb_ptx/src/main.c
+++ b/samples/esb/esb_ptx/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/nrf5340/empty_app_core/README.rst b/samples/nrf5340/empty_app_core/README.rst
index a1fd28b87ff2..f38ee44743f0 100644
--- a/samples/nrf5340/empty_app_core/README.rst
+++ b/samples/nrf5340/empty_app_core/README.rst
@@ -55,7 +55,6 @@ Dependencies
 
 This sample has the following `nrfx`_ dependencies:
 
-* ``nrfx/nrf.h``
 * ``nrfx/nrfx.h``
 
 In addition, it uses the following Zephyr libraries:
diff --git a/samples/nrf5340/empty_app_core/src/main.c b/samples/nrf5340/empty_app_core/src/main.c
index 764f7bdfe69e..bdd6260ddf47 100644
--- a/samples/nrf5340/empty_app_core/src/main.c
+++ b/samples/nrf5340/empty_app_core/src/main.c
@@ -7,7 +7,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/init.h>
-#include <nrf.h>
 #include <nrfx.h>
 
 #define LFXO_NODE DT_NODELABEL(lfxo)
diff --git a/samples/peripheral/radio_test/src/main.c b/samples/peripheral/radio_test/src/main.c
index 7261c4f0b9f7..fe7ceb604581 100644
--- a/samples/peripheral/radio_test/src/main.c
+++ b/samples/peripheral/radio_test/src/main.c
@@ -13,7 +13,7 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/peripheral/radio_test/src/radio_test.c b/samples/peripheral/radio_test/src/radio_test.c
index 3f19ab7dac51..f933ef9a1a48 100644
--- a/samples/peripheral/radio_test/src/radio_test.c
+++ b/samples/peripheral/radio_test/src/radio_test.c
@@ -28,7 +28,6 @@
 #include "fem_al/fem_al.h"
 #endif /* CONFIG_FEM */
 
-#include <nrf_erratas.h>
 #if NRF54H_ERRATA_216_PRESENT
 #include <zephyr/drivers/mbox.h>
 #endif /* NRF54H_ERRATA_216_PRESENT */
diff --git a/soc/nordic/nrf71/soc.c b/soc/nordic/nrf71/soc.c
index 91ef0d4564d6..b594563330af 100644
--- a/soc/nordic/nrf71/soc.c
+++ b/soc/nordic/nrf71/soc.c
@@ -29,9 +29,9 @@
 #include <cmsis_core.h>
 #include <hal/nrf_glitchdet.h>
 #endif
-#include <soc/nrfx_coredep.h>
 
-#include <system_nrf7120_enga.h>
+#include <nrfx.h>
+#include <soc/nrfx_coredep.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c b/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
index 281ca2dc12f0..9846c5540d6d 100644
--- a/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
+++ b/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
@@ -8,7 +8,7 @@
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/toolchain.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_cc310_bl_init.h>
 #include <pm_config.h>
 
diff --git a/subsys/bootloader/bl_storage/bl_storage.c b/subsys/bootloader/bl_storage/bl_storage.c
index 4596fa400a06..db26b2816198 100644
--- a/subsys/bootloader/bl_storage/bl_storage.c
+++ b/subsys/bootloader/bl_storage/bl_storage.c
@@ -8,7 +8,7 @@
 #include <zephyr/autoconf.h>
 #include <string.h>
 #include <errno.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <assert.h>
 #if !defined(CONFIG_BUILD_WITH_TFM)
 #include <zephyr/kernel.h>
diff --git a/subsys/esb/esb.c b/subsys/esb/esb.c
index be8ec038c935..8f93721501ea 100644
--- a/subsys/esb/esb.c
+++ b/subsys/esb/esb.c
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <errno.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <stddef.h>
 #include <string.h>
-#include <nrf_erratas.h>
 
 #include <hal/nrf_radio.h>
 #include <hal/nrf_timer.h>
diff --git a/subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c b/subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c
index 0bb03da3b8dc..eac65d6914c1 100644
--- a/subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c
+++ b/subsys/mpsl/clock_ctrl/mpsl_clock_ctrl.c
@@ -15,6 +15,7 @@
 
 #include <mpsl_clock.h>
 #include "mpsl_clock_ctrl.h"
+#include "nrf_errno.h"
 
 LOG_MODULE_REGISTER(mpsl_clock_ctrl, CONFIG_MPSL_LOG_LEVEL);
 
diff --git a/subsys/nfc/lib/platform.c b/subsys/nfc/lib/platform.c
index 4ca00fb83b47..c6c86d20a3ff 100644
--- a/subsys/nfc/lib/platform.c
+++ b/subsys/nfc/lib/platform.c
@@ -18,8 +18,6 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/onoff.h>
 
-#include <nrf_erratas.h>
-
 #include <nrfx_nfct.h>
 #include <nrfx_timer.h>
 #include <hal/nrf_ficr.h>
diff --git a/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h b/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
index 8096193eb88c..0a0c8a374676 100644
--- a/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
+++ b/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 #include <hal/nrf_cracen.h>
 
diff --git a/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c b/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
index a6fc0028b126..d3633722c4b0 100644
--- a/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
+++ b/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/kernel.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #if defined(CONFIG_SOC_SERIES_NRF54LX)
 #include <nrfx_rramc.h>
diff --git a/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h b/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
index d736cf2c6af1..036832f8dcd9 100644
--- a/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
+++ b/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
@@ -8,7 +8,7 @@
 #define HW_HEADER_FILE
 
 #include <cracen/membarriers.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <sxsymcrypt/internal.h>

From 61d8cbb170321167dd752b89a6aa42f6db894902 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 16 Oct 2025 12:48:02 +0200
Subject: [PATCH 6/8] mpsl: align to name change in mpsl_hwres

It was split into mpsl_dppi.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 subsys/mpsl/hwres/CMakeLists.txt                | 2 +-
 subsys/mpsl/hwres/{mpsl_hwres.c => mpsl_dppi.c} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename subsys/mpsl/hwres/{mpsl_hwres.c => mpsl_dppi.c} (98%)

diff --git a/subsys/mpsl/hwres/CMakeLists.txt b/subsys/mpsl/hwres/CMakeLists.txt
index 1429ecfe292e..fd9a0d27a1f0 100644
--- a/subsys/mpsl/hwres/CMakeLists.txt
+++ b/subsys/mpsl/hwres/CMakeLists.txt
@@ -6,4 +6,4 @@
 
 zephyr_library()
 
-zephyr_library_sources(mpsl_hwres.c)
+zephyr_library_sources(mpsl_dppi.c)
diff --git a/subsys/mpsl/hwres/mpsl_hwres.c b/subsys/mpsl/hwres/mpsl_dppi.c
similarity index 98%
rename from subsys/mpsl/hwres/mpsl_hwres.c
rename to subsys/mpsl/hwres/mpsl_dppi.c
index 5318403f8695..7ec3a2013ddc 100644
--- a/subsys/mpsl/hwres/mpsl_hwres.c
+++ b/subsys/mpsl/hwres/mpsl_dppi.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <mpsl_hwres.h>
+#include <mpsl_dppi.h>
 #if defined(DPPI_PRESENT)
 #include <nrfx_dppi.h>
 #endif

From e93187c0703d70d3002daf02de32b54a855c67a1 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 16 Oct 2025 12:39:05 +0200
Subject: [PATCH 7/8] scripts: quarantine: add ns targets

Until TF-M is fixed.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 scripts/quarantine.yaml        | 4 ++++
 scripts/quarantine_zephyr.yaml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
index 3b4c80b9c5d6..365e831759c3 100644
--- a/scripts/quarantine.yaml
+++ b/scripts/quarantine.yaml
@@ -173,3 +173,7 @@
   platforms:
     - nrf5340dk/nrf5340/cpuapp
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-8480"
+
+- platforms:
+    - .*ns
+  comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"
diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml
index 0e023a9ad428..0d60b63585b6 100644
--- a/scripts/quarantine_zephyr.yaml
+++ b/scripts/quarantine_zephyr.yaml
@@ -587,3 +587,7 @@
     - llext.writable_relocatable_slid_linking
     - llext.writable_relocatable
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-8497"
+
+- platforms:
+    - .*ns
+  comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"

From bacd9e9f295a4fc088346051505932ca32a8b54e Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Fri, 17 Oct 2025 11:35:56 +0200
Subject: [PATCH 8/8] scripts: quarantine: add mcuboot fails

mcuboot needs to be aligned to nrfx 4.0

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 scripts/quarantine.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
index 365e831759c3..d57473485096 100644
--- a/scripts/quarantine.yaml
+++ b/scripts/quarantine.yaml
@@ -177,3 +177,30 @@
 - platforms:
     - .*ns
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"
+
+- scenarios:
+    - bluetooth.controller
+  platforms:
+    - native_sim/native
+  comment: "https://nordicsemi.atlassian.net/browse/NRFX-8565"
+
+- scenarios:
+    - sample.bluetooth.fast_pair.*
+    - sample.bluetooth.mesh.*
+    - sample.dfu.dfu_target
+    - sample.matter.*
+    - sample.mcuboot.*
+    - mcuboot.*
+    - sample.nrf_security.sha256.integration
+    - sample.find_my.switchable_networks.*
+    - sample.find_my.locator_tag.*
+    - bluetooth.mesh.metadata_extraction_.*
+    - nrf_compress.*
+    - sample.cellular.smp_svr
+    - mcuboot.direct_xip
+  platforms:
+    - nrf52840dk/nrf52840
+    - nrf52840dongle/nrf52840
+    - nrf9160dk@0.14.0/nrf52840
+    - nrf9160dk@0.14.0/nrf9160
+  comment: "https://nordicsemi.atlassian.net/browse/NRFX-8562"