Skip to content

drivers: can: numaker: fix m55m1x core clock #99481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −2
Open

drivers: can: numaker: fix m55m1x core clock #99481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions drivers/can/can_numaker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
#include <soc.h>
#include <NuMicro.h>

#if defined(CONFIG_SOC_SERIES_M55M1X)
#include <zephyr/dt-bindings/clock/numaker_m55m1x_clock.h>
#endif

LOG_MODULE_REGISTER(can_numaker, CONFIG_CAN_LOG_LEVEL);

/* Implementation notes
Expand All @@ -42,11 +46,28 @@ static int can_numaker_get_core_clock(const struct device *dev, uint32_t *rate)
const struct can_numaker_config *config = mcan_config->custom;
uint32_t clksrc_rate_idx;
uint32_t clkdiv_divider;
__typeof__(CANFD0_MODULE) clk_modidx_real;

#if defined(CONFIG_SOC_SERIES_M55M1X)
switch (config->clk_modidx) {
case NUMAKER_CANFD0_MODULE:
clk_modidx_real = CANFD0_MODULE;
break;
case NUMAKER_CANFD1_MODULE:
clk_modidx_real = CANFD1_MODULE;
Copy link
Contributor

@ssekar15 ssekar15 Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing break; ? or else add __fallthrough;

Copy link
Contributor Author

@ccli8 ccli8 Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

break is missing, thanks

break;
default:
LOG_ERR("Invalid clock module index");
return -EIO;
}
#else
clk_modidx_real = config->clk_modidx;
#endif

/* Module clock source rate */
clksrc_rate_idx = CLK_GetModuleClockSource(config->clk_modidx);
clksrc_rate_idx = CLK_GetModuleClockSource(clk_modidx_real);
/* Module clock divider */
clkdiv_divider = CLK_GetModuleClockDivider(config->clk_modidx) + 1;
clkdiv_divider = CLK_GetModuleClockDivider(clk_modidx_real) + 1;

switch (clksrc_rate_idx) {
#if defined(CONFIG_SOC_SERIES_M46X)
Expand Down