treewide: apply various patches needed to build the samples

Just for testing.

Signed-off-by: Michał Bainczyk <[email protected]>

Author: mib1-nordic

drivers/clock_control/clock_control_nrf.c

@@ -800,7 +800,6 @@ static void hfclkaudio_init(void)
 
 static int clk_init(const struct device *dev)
 {
-	nrfx_err_t nrfx_err;
 	int err;
 	static const struct onoff_transitions transitions = {
 		.start = onoff_start,
@@ -814,8 +813,7 @@ static int clk_init(const struct device *dev)
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
 		    nrfx_isr, nrfx_power_clock_irq_handler, 0);
 
-	nrfx_err = nrfx_clock_init(clock_event_handler);
-	if (nrfx_err != NRFX_SUCCESS) {
+	if (nrfx_clock_init(clock_event_handler) != 0) {
 		return -EIO;
 	}
 

modules/hal_nordic/nrfx/CMakeLists.txt

@@ -130,22 +130,22 @@ zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL       ${HELPERS_DIR}/nrf
 if(CONFIG_NRFX_GPPI)
   zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_shim.c)
   if(CONFIG_HAS_HW_NRF_PPI)
-    zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_ppi.c)
-    zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_ppi.c)
     zephyr_library_sources_ifndef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/nrfx_gppi_ppi.c)
   else()
-    zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_dppi.c)
     zephyr_library_sources_ifndef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
-    zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_dppi.c)
   endif()
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_NRFX_PRS     ${SRC_DIR}/prs/nrfx_prs.c)
 
 zephyr_library_sources_ifdef(CONFIG_NRFX_ADC     ${SRC_DIR}/nrfx_adc.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock_lfclk.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock_hfclk.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock_xo.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock_lfclk.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock_hfclk192m.c)
+zephyr_library_sources_ifdef(CONFIG_NRFX_CLOCK   ${SRC_DIR}/nrfx_clock_hfclkaudio.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_COMP    ${SRC_DIR}/nrfx_comp.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_CRACEN  ${SRC_DIR}/nrfx_cracen.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_EGU     ${SRC_DIR}/nrfx_egu.c)
@@ -220,8 +220,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
 zephyr_compile_definitions_ifndef(CONFIG_SOC_NRF54L_ANOMALY_56_WORKAROUND NRF54L_CONFIGURATION_56_ENABLE=0)
 
 if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
-  zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_ppib.c)
-  zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_ppib.c)
   zephyr_library_sources_ifndef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/nrfx_gppi_lumos.c)
 endif()
 

modules/hal_nordic/nrfx/Kconfig

@@ -417,10 +417,10 @@ config NRFX_SPI2
 	select NRFX_SPI
 
 config NRFX_SPIM
-	bool
+	bool "SPIM driver"
 
 config NRFX_SPIS
-	bool
+	bool "SPIS driver"
 
 config NRFX_SYSTICK
 	bool "SYSTICK driver"

modules/hal_nordic/nrfx/nrfx_glue.c

@@ -10,7 +10,7 @@
 
 void nrfx_isr(const void *irq_handler)
 {
-	((nrfx_irq_handler_t)irq_handler)();
+	((nrfx_irq_handler_t)irq_handler)(NULL);
 }
 
 void nrfx_busy_wait(uint32_t usec_to_wait)

samples/net/zperf/src/nrf5340_cpu_boost.c

@@ -22,7 +22,6 @@ static int nrf53_cpu_boost(void)
 
 	/* For optimal performance, the CPU frequency should be set to 128 MHz */
 	err = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
-	err -= NRFX_ERROR_BASE_NUM;
 	if (err != 0) {
 		LOG_WRN("Failed to set 128 MHz: %d", err);
 	}

scripts/pylib/twister/twisterlib/coverage.py

@@ -413,10 +413,9 @@ def collect_coverage(self, outdir, coverage_file, ztest_file, coveragelog):
         # We want to remove tests/* and tests/ztest/test/* but save tests/ztest
         cmd = ["gcovr", "-r", self.base_dir,
                "--gcov-ignore-parse-errors=negative_hits.warn_once_per_file",
+               "--gcov-ignore-parse-errors=suspicious_hits.warn_once_per_file",
                "--gcov-executable", self.gcov_tool,
                "-e", "tests/*"]
-        if self.version >= "7.0":
-            cmd += ["--gcov-object-directory", outdir]
         cmd += excludes + self.options + ["--json", "-o", coverage_file, outdir]
         cmd_str = " ".join(cmd)
         logger.debug(f"Running: {cmd_str}")
@@ -431,8 +430,6 @@ def collect_coverage(self, outdir, coverage_file, ztest_file, coveragelog):
         cmd += ["--gcov-executable", self.gcov_tool,
                 "-f", "tests/ztest", "-e", "tests/ztest/test/*",
                 "--json", "-o", ztest_file, outdir]
-        if self.version >= "7.0":
-            cmd += ["--gcov-object-directory", outdir]
 
         cmd_str = " ".join(cmd)
         logger.debug(f"Running: {cmd_str}")

soc/nordic/nrf54l/soc.c

@@ -23,7 +23,7 @@
 #include <lib/nrfx_coredep.h>
 #include <soc.h>
 #include <helpers/nrfx_gppi.h>
-#include <helpers/nrfx_gppi_lumos.h>
+#include "../../../../nrfx/bsp/stable/soc/interconnect/nrfx_gppi_lumos.h"
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
 #if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \

subsys/bluetooth/audio/shell/bap_usb.c

@@ -738,7 +738,6 @@ int bap_usb_init(void)
 		 */
 		err = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
 
-		err -= NRFX_ERROR_BASE_NUM;
 		if (err != 0) {
 			LOG_WRN("Failed to set 128 MHz: %d", err);
 		}