Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions drivers/mpsl/clock_control/nrfx_clock_mpsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ static nrfx_clock_event_handler_t event_handler;

static void mpsl_hfclk_callback(void)
{
#if IS_ENABLED(CONFIG_SOC_SERIES_NRF54LX)
event_handler(NRFX_CLOCK_EVT_XO_TUNED);
#else
event_handler(NRFX_CLOCK_EVT_HFCLK_STARTED);
#endif
}

void nrfx_clock_start(nrf_clock_domain_t domain)
Expand Down
4 changes: 2 additions & 2 deletions tests/drivers/audio/pdm_loopback/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ ZTEST(pdm_loopback, test_pdm_clk_frequency)

uint32_t pulses = nrfx_timer_capture_get(&timer_instance, NRF_TIMER_CC_CHANNEL0);

/* Assert that captured frequency is within 2% margin of expected one. */
/* Assert that captured frequency is within 3% margin of expected one. */
zassert_within(pulses, PDM_EXPECTED_FREQ * SAMPLING_RATIO,
PDM_EXPECTED_FREQ * SAMPLING_RATIO / 50,
PDM_EXPECTED_FREQ * SAMPLING_RATIO / 30,
"Captured incorrect frequency Hz. Captured pulses = %lu, expected = %lu",
pulses, PDM_EXPECTED_FREQ * SAMPLING_RATIO);
}
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 8dbca43a6a9d332c62457789780c569e907aa7f7
revision: 36d6c196da011ff0f5bd00d89ac2e0fc5e4ae97d
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading