michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: hal_nordic: use CLOCK_CONTROL_NRF2 for HFCLK request/release

Browse source 
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>
This commit is contained in:
Piotr Koziar 2024-11-26 12:29:00 +01:00 • committed by Benjamin Cabé
commit b6ca9dbc71
1 changed files with 8 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
View file

@ -11,12 +11,7 @@
#include <compiler_abstraction.h> #include <compiler_abstraction.h>
#include <zephyr/kernel.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/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; static bool hfclk_is_running;
@ -35,7 +30,6 @@ bool nrf_802154_clock_hfclk_is_running(void)
return hfclk_is_running; return hfclk_is_running;
} }
#if defined(CONFIG_CLOCK_CONTROL_NRF)
static struct onoff_client hfclk_cli; static struct onoff_client hfclk_cli;
@ -48,6 +42,7 @@ static void hfclk_on_callback(struct onoff_manager *mgr,
nrf_802154_clock_hfclk_ready(); nrf_802154_clock_hfclk_ready();
} }
#if defined(CONFIG_CLOCK_CONTROL_NRF)
void nrf_802154_clock_hfclk_start(void) void nrf_802154_clock_hfclk_start(void)
{ {
int ret; int ret;
@ -75,40 +70,22 @@ void nrf_802154_clock_hfclk_stop(void)
hfclk_is_running = false; hfclk_is_running = false;
} }
#elif defined(NRF54H_SERIES) #elif defined(CONFIG_CLOCK_CONTROL_NRF2)
#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) void nrf_802154_clock_hfclk_start(void)
{ {
/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger. sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
* This code might cause troubles if there are other HFXO users in this CPU. int ret = nrf_clock_control_request(DEVICE_DT_GET(DT_NODELABEL(hfxo)), NULL, &hfclk_cli);
*/
NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
NRF_LRCCONF_RADIO_PD->TASKS_REQHFXO = 0x1;
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) void nrf_802154_clock_hfclk_stop(void)
{ {
/* Use register directly, there is no support for that task in nrf_lrcconf_task_trigger. int ret = nrf_clock_control_cancel_or_release(DEVICE_DT_GET(DT_NODELABEL(hfxo)),
* This code might cause troubles if there are other HFXO users in this CPU. NULL, &hfclk_cli);
*/
NRF_LRCCONF_RADIO_PD->TASKS_STOPREQHFXO = 0x1;
NRF_LRCCONF_RADIO_PD->EVENTS_HFXOSTARTED = 0x0;
hfclk_is_running = false; __ASSERT_NO_MSG(ret >= 0);
} }
#endif #endif