Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c05c7c9
[nrf noup] manifest: update hal_nordic to nrfx 4.0-rc2
masz-nordic Nov 4, 2025
4805752
[nrf noup] modules: hal_nordic: add linking nrfx lfclock
magp-nordic Nov 4, 2025
5a0e90b
[nrf noup] modules: hal_nordic: add linking nrfx hfclk192m
masz-nordic Nov 4, 2025
0a9b54b
drivers: timer: nrf_grtc_timer: Adapt to the new nrfx_grtc API
nordic-krch Nov 3, 2025
2566d87
modules: hal_nordic: Cleanup after GPPI update
nordic-krch Nov 4, 2025
222c7de
modules: hal_nordic: Align nrfx_irq_handler type
adamkondraciuk Oct 30, 2025
c81f3f5
[nrf fromlist] drivers: clock_control: Updated nrfx_clock_* error codes.
mif1-nordic Nov 5, 2025
9900f46
[nrf fromlist] drivers: adc: nrfx_adc: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
4b2f88f
[nrf fromlist] drivers: comparator: nrf_comp: align to errno codes in…
mstasiaknordic Oct 21, 2025
6337c96
[nrf fromlist] drivers: entropy: nrf_cracen: align to errno codes in …
mstasiaknordic Oct 21, 2025
6aa8ba9
[nrf fromlist] drivers: comparator: nrf_lpcomp: align to errno codes …
mstasiaknordic Oct 21, 2025
0ae6e6b
[nrf fromlist] drivers: flash: nrf_mramc: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
02b07f3
[nrf fromlist] soc: nordic: sys_event: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
c2e7b59
[nrf fromlist] modules: nrf_wifi: qspi_if: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
bd33a83
[nrf fromlist] drivers: flash: nrf_qspi_nor: align to errno codes in …
mstasiaknordic Oct 21, 2025
1768ffb
[nrf fromlist] drivers: adc: nrfx_saadc: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
7715ac7
[nrf fromlist] drivers: spi: nrfx_spi: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
5238c67
[nrf fromlist] drivers: i2c: nrfx_twi: align to errno codes in nrfx
mstasiaknordic Oct 21, 2025
2a67709
[nrf fromlist] modules: hal_nordic: nrfx: make NRFX_SPI(M/S) selectable
mstasiaknordic Oct 23, 2025
2bd6027
[nrf noup] modules: hal_nordic: add linking nrfx hfclkaudio, xo24
masz-nordic Nov 6, 2025
463c39f
[nrf noup] modules: hal_nordic: Use GPPI for NRF54LX
nordic-krch Nov 6, 2025
2be4297
drivers: i2c: i2c_nrfx: minor fixes
adamkondraciuk Nov 3, 2025
84425e1
drivers: pwm: pwm_nrfx: minor fixes
adamkondraciuk Nov 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/adc/adc_nrfx_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,12 @@ static int init_adc(const struct device *dev)
{
const nrfx_adc_config_t config = NRFX_ADC_DEFAULT_CONFIG;

nrfx_err_t result = nrfx_adc_init(&config, event_handler);
int result = nrfx_adc_init(&config, event_handler);

if (result != NRFX_SUCCESS) {
if (result != 0) {
LOG_ERR("Failed to initialize device: %s",
dev->name);
return -EBUSY;
return result;
}

IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
Expand Down
67 changes: 32 additions & 35 deletions drivers/adc/adc_nrfx_saadc.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@
m_data.divide_single_ended_value &= ~BIT(channel_cfg->channel_id);
}

nrfx_err_t ret = nrfx_saadc_channel_config(&cfg);
err = nrfx_saadc_channel_config(&cfg);

if (ret != NRFX_SUCCESS) {
LOG_ERR("Cannot configure channel %d: 0x%08x", channel_cfg->channel_id, ret);
return -EINVAL;
if (err != 0) {
LOG_ERR("Cannot configure channel %d: %d", channel_cfg->channel_id, err);
return err;
}

return 0;
Expand All @@ -284,10 +284,10 @@
if (ctx->sequence.calibrate) {
nrfx_saadc_offset_calibrate(event_handler);
} else {
nrfx_err_t ret = nrfx_saadc_mode_trigger();
int ret = nrfx_saadc_mode_trigger();

if (ret != NRFX_SUCCESS) {
LOG_ERR("Cannot start sampling: 0x%08x", ret);
if (ret != 0) {
LOG_ERR("Cannot start sampling: %d", ret);
adc_context_complete(ctx, -EIO);
}
}
Expand All @@ -312,10 +312,9 @@
return;
}

nrfx_err_t nrfx_err =
nrfx_saadc_buffer_set(samples_buffer, m_data.active_channel_cnt);
if (nrfx_err != NRFX_SUCCESS) {
LOG_ERR("Failed to set buffer: 0x%08x", nrfx_err);
error = nrfx_saadc_buffer_set(samples_buffer, m_data.active_channel_cnt);
if (error != 0) {
LOG_ERR("Failed to set buffer: %d", error);
adc_context_complete(ctx, -EIO);
}
}
Expand All @@ -326,10 +325,10 @@
if (!m_data.internal_timer_enabled) {
k_timer_start(&m_data.timer, K_NO_WAIT, K_USEC(ctx->options.interval_us));
} else {
nrfx_err_t ret = nrfx_saadc_mode_trigger();
int ret = nrfx_saadc_mode_trigger();

if (ret != NRFX_SUCCESS) {
LOG_ERR("Cannot start sampling: 0x%08x", ret);
if (ret != 0) {
LOG_ERR("Cannot start sampling: %d", ret);
adc_context_complete(&m_data.ctx, -EIO);
}
}
Expand Down Expand Up @@ -499,7 +498,6 @@
static int start_read(const struct device *dev,
const struct adc_sequence *sequence)
{
nrfx_err_t nrfx_err;
int error;
uint32_t selected_channels = sequence->channels;
nrf_saadc_resolution_t resolution;
Expand Down Expand Up @@ -557,21 +555,21 @@

m_data.internal_timer_enabled = true;

nrfx_err = nrfx_saadc_advanced_mode_set(selected_channels, resolution, &adv_config,
event_handler);
error = nrfx_saadc_advanced_mode_set(selected_channels, resolution, &adv_config,
event_handler);
} else {
m_data.internal_timer_enabled = false;

nrfx_err = nrfx_saadc_simple_mode_set(selected_channels, resolution, oversampling,
event_handler);
error = nrfx_saadc_simple_mode_set(selected_channels, resolution, oversampling,
event_handler);
}

if (nrfx_err != NRFX_SUCCESS) {
return -EINVAL;
if (error != 0) {
return error;
}

error = check_buffer_size(sequence, active_channel_cnt);
if (error) {
if (error != 0) {
return error;
}

Expand All @@ -592,14 +590,13 @@
/* Buffer is filled in chunks, each chunk composed of number of samples equal to number
* of active channels. Buffer pointer is advanced and reloaded after each chunk.
*/
nrfx_err = nrfx_saadc_buffer_set(
samples_buffer,
(m_data.internal_timer_enabled
? (1 + sequence->options->extra_samplings)
: active_channel_cnt));
if (nrfx_err != NRFX_SUCCESS) {
LOG_ERR("Failed to set buffer: 0x%08x", nrfx_err);
return -EINVAL;
error = nrfx_saadc_buffer_set(samples_buffer,
(m_data.internal_timer_enabled
? (1 + sequence->options->extra_samplings)
: active_channel_cnt));
if (error != 0) {

Check notice on line 597 in drivers/adc/adc_nrfx_saadc.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change

drivers/adc/adc_nrfx_saadc.c:597 - ? (1 + sequence->options->extra_samplings) - : active_channel_cnt)); + ? (1 + sequence->options->extra_samplings) + : active_channel_cnt));
LOG_ERR("Failed to set buffer: %d", error);
return error;
}

adc_context_start_read(&m_data.ctx, sequence);
Expand Down Expand Up @@ -638,7 +635,7 @@

static void event_handler(const nrfx_saadc_evt_t *event)
{
nrfx_err_t err;
int err;

if (event->type == NRFX_SAADC_EVT_DONE) {
dmm_buffer_in_release(
Expand All @@ -657,8 +654,8 @@
adc_context_on_sampling_done(&m_data.ctx, DEVICE_DT_INST_GET(0));
} else if (event->type == NRFX_SAADC_EVT_CALIBRATEDONE) {
err = nrfx_saadc_mode_trigger();
if (err != NRFX_SUCCESS) {
LOG_ERR("Cannot start sampling: 0x%08x", err);
if (err != 0) {
LOG_ERR("Cannot start sampling: %d", err);
adc_context_complete(&m_data.ctx, -EIO);
}
} else if (event->type == NRFX_SAADC_EVT_FINISHED) {
Expand All @@ -668,13 +665,13 @@

static int init_saadc(const struct device *dev)
{
nrfx_err_t err;
int err;

k_timer_init(&m_data.timer, external_timer_expired_handler, NULL);

/* The priority value passed here is ignored (see nrfx_glue.h). */
err = nrfx_saadc_init(0);
if (err != NRFX_SUCCESS) {
if (err != 0) {
LOG_ERR("Failed to initialize device: %s", dev->name);
return -EIO;
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/clock_control/clock_control_nrf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/comparator/comparator_nrf_comp.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ static int shim_nrf_comp_init(const struct device *dev)
(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) {
if (nrfx_comp_init(&nrf, shim_nrf_comp_event_handler) != 0) {
return -ENODEV;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/comparator/comparator_nrf_lpcomp.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@
&shim_nrf_lpcomp_data0.config);

if (nrfx_lpcomp_init(&shim_nrf_lpcomp_data0.config,
shim_nrf_lpcomp_event_handler) != NRFX_SUCCESS) {
shim_nrf_lpcomp_event_handler) != 0) {
return -ENODEV;

Check notice on line 360 in drivers/comparator/comparator_nrf_lpcomp.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change

drivers/comparator/comparator_nrf_lpcomp.c:360 - if (nrfx_lpcomp_init(&shim_nrf_lpcomp_data0.config, - shim_nrf_lpcomp_event_handler) != 0) { + if (nrfx_lpcomp_init(&shim_nrf_lpcomp_data0.config, shim_nrf_lpcomp_event_handler) != 0) {
}

return pm_device_driver_init(dev, shim_nrf_lpcomp_pm_callback);
Expand Down
14 changes: 3 additions & 11 deletions drivers/entropy/entropy_nrf_cracen.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ static int nrf_cracen_get_entropy_isr(const struct device *dev, uint8_t *buf, ui

irq_unlock(key);

if (likely(ret == NRFX_SUCCESS)) {
if (likely(ret == 0)) {
return len;
} else if (ret == NRFX_ERROR_INVALID_PARAM) {
return -EINVAL;
} else {
return -EAGAIN;
return ret;
}
}

Expand All @@ -47,13 +45,7 @@ static int nrf_cracen_cracen_init(const struct device *dev)
{
(void)dev;

int ret = nrfx_cracen_ctr_drbg_init();

if (ret == NRFX_SUCCESS) {
return 0;
} else {
return -EIO;
}
return nrfx_cracen_ctr_drbg_init();
}

static DEVICE_API(entropy, nrf_cracen_api_funcs) = {
Expand Down
Loading
Loading