adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: can: nrf: make sure HSFLL frequency >= AUXPLL

Browse source 
When CAN is used, HSFLL frequency must >= AUXPLL frequency. Make sure to
send a request to the HSFLL clock instance.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2024-11-29 15:12:05 +01:00 committed by Benjamin Cabé
parent b56c61a1d8
commit d78952b7ba
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/can/can_nrf.c
View file

@ -13,6 +13,7 @@
#include <zephyr/drivers/can.h> #include <zephyr/drivers/can.h>
#include <zephyr/drivers/can/can_mcan.h> #include <zephyr/drivers/can/can_mcan.h>
#include <zephyr/drivers/clock_control.h> #include <zephyr/drivers/clock_control.h>
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
#include <zephyr/drivers/pinctrl.h> #include <zephyr/drivers/pinctrl.h>
#include <zephyr/irq.h> #include <zephyr/irq.h>
@ -27,7 +28,8 @@ struct can_nrf_config {
uint32_t mcan; uint32_t mcan;
uint32_t mrba; uint32_t mrba;
uint32_t mram; uint32_t mram;
const struct device *clock; const struct device *auxpll;
const struct device *hsfll;
const struct pinctrl_dev_config *pcfg; const struct pinctrl_dev_config *pcfg;
void (*irq_configure)(void); void (*irq_configure)(void);
uint16_t irq; uint16_t irq;
@ -54,7 +56,7 @@ static int can_nrf_get_core_clock(const struct device *dev, uint32_t *rate)
const struct can_mcan_config *mcan_config = dev->config; const struct can_mcan_config *mcan_config = dev->config;
const struct can_nrf_config *config = mcan_config->custom; const struct can_nrf_config *config = mcan_config->custom;
return clock_control_get_rate(config->clock, NULL, rate); return clock_control_get_rate(config->auxpll, NULL, rate);
} }
static DEVICE_API(can, can_nrf_api) = { static DEVICE_API(can, can_nrf_api) = {
@ -131,17 +133,41 @@ static const struct can_mcan_ops can_mcan_nrf_ops = {
.clear_mram = can_nrf_clear_mram, .clear_mram = can_nrf_clear_mram,
}; };
static int configure_hsfll(const struct device *dev, bool on)
{
const struct can_mcan_config *mcan_config = dev->config;
const struct can_nrf_config *config = mcan_config->custom;
struct nrf_clock_spec spec = { 0 };
/* If CAN is on, HSFLL frequency >= AUXPLL frequency */
if (on) {
int ret;
ret = clock_control_get_rate(dev, NULL, &spec.frequency);
if (ret < 0) {
return ret;
}
}
return nrf_clock_control_request_sync(config->hsfll, &spec, K_FOREVER);
}
static int can_nrf_init(const struct device *dev) static int can_nrf_init(const struct device *dev)
{ {
const struct can_mcan_config *mcan_config = dev->config; const struct can_mcan_config *mcan_config = dev->config;
const struct can_nrf_config *config = mcan_config->custom; const struct can_nrf_config *config = mcan_config->custom;
int ret; int ret;
if (!device_is_ready(config->clock)) { if (!device_is_ready(config->auxpll) || !device_is_ready(config->hsfll)) {
return -ENODEV; return -ENODEV;
} }
ret = clock_control_on(config->clock, NULL); ret = configure_hsfll(dev, true);
if (ret < 0) {
return ret;
}
ret = clock_control_on(config->auxpll, NULL);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -186,8 +212,9 @@ static int can_nrf_init(const struct device *dev)
.mcan = CAN_MCAN_DT_INST_MCAN_ADDR(n), \ .mcan = CAN_MCAN_DT_INST_MCAN_ADDR(n), \
.mrba = CAN_MCAN_DT_INST_MRBA(n), \ .mrba = CAN_MCAN_DT_INST_MRBA(n), \
.mram = CAN_MCAN_DT_INST_MRAM_ADDR(n), \ .mram = CAN_MCAN_DT_INST_MRAM_ADDR(n), \
.clock = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)), \ .auxpll = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR_BY_NAME(n, auxpll)), \
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \ .pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
.hsfll = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR_BY_NAME(n, hsfll)), \
.irq = DT_INST_IRQN(n), \ .irq = DT_INST_IRQN(n), \
.irq_configure = can_nrf_irq_configure##n, \ .irq_configure = can_nrf_irq_configure##n, \
}; \ }; \