bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: can: sam0: fix clock configuration for SAM0 series

Browse Source 
Fixed a bug where unconfigured clocks were connected to the can
interface in the device tree for SAM0, causing the interface to work
incorrectly. Fixed by adding the correct index when calling GENCTRL.
Also, the default divider has been reduced to 6 to allow setting
the bitrate to 500 kbps.

Tested on a canopennode sample on a board with an ATSAMC21E18A
microcontroller.

Signed-off-by: Vitaliy Livnov <vitaliy.livnov@devkit.agency>
This commit is contained in:
Vitaliy Livnov 2025-03-31 19:55:40 +03:00 committed by Daniel DeGrasse
parent e1248eff82
commit e6894ad576
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/can/can_sam0.c
View File

@ -113,20 +113,22 @@ static int can_sam0_get_core_clock(const struct device *dev, uint32_t *rate)
static void can_sam0_clock_enable(const struct can_sam0_config *cfg) static void can_sam0_clock_enable(const struct can_sam0_config *cfg)
{ {
uint8_t gen_index = cfg->gclk_gen;
*cfg->mclk |= cfg->mclk_mask; *cfg->mclk |= cfg->mclk_mask;
GCLK->PCHCTRL[cfg->gclk_id].reg = GCLK_PCHCTRL_CHEN GCLK->PCHCTRL[cfg->gclk_id].reg = GCLK_PCHCTRL_CHEN
| GCLK_PCHCTRL_GEN(cfg->gclk_gen); | GCLK_PCHCTRL_GEN(gen_index);
/* Enable the GLCK7 with DIV*/ /* Enable the GLCK<gen_index> with DIV*/
#if defined(CONFIG_SOC_SERIES_SAME51) || defined(CONFIG_SOC_SERIES_SAME54) #if defined(CONFIG_SOC_SERIES_SAME51) || defined(CONFIG_SOC_SERIES_SAME54)
/*DFFL has to be used as clock source for the ATSAME51/54 family of SoCs*/ /*DFFL has to be used as clock source for the ATSAME51/54 family of SoCs*/
GCLK->GENCTRL[7].reg = GCLK_GENCTRL_SRC(GCLK_GENCTRL_SRC_DFLL) GCLK->GENCTRL[gen_index].reg = GCLK_GENCTRL_SRC(GCLK_GENCTRL_SRC_DFLL)
| GCLK_GENCTRL_DIV(cfg->divider) | GCLK_GENCTRL_DIV(cfg->divider)
| GCLK_GENCTRL_GENEN; | GCLK_GENCTRL_GENEN;
#elif defined(CONFIG_SOC_SERIES_SAMC21) #elif defined(CONFIG_SOC_SERIES_SAMC21)
/*OSC48M has to be used as clock source for the ATSAMC21 family of SoCs*/ /*OSC48M has to be used as clock source for the ATSAMC21 family of SoCs*/
GCLK->GENCTRL[7].reg = GCLK_GENCTRL_SRC(GCLK_GENCTRL_SRC_OSC48M) GCLK->GENCTRL[gen_index].reg = GCLK_GENCTRL_SRC(GCLK_GENCTRL_SRC_OSC48M)
| GCLK_GENCTRL_DIV(cfg->divider) | GCLK_GENCTRL_DIV(cfg->divider)
| GCLK_GENCTRL_GENEN; | GCLK_GENCTRL_GENEN;
#endif #endif

8
dts/arm/atmel/samc21.dtsi
View File

@ -61,12 +61,12 @@
interrupt-names = "int0"; interrupt-names = "int0";
clocks = <&gclk 26>, <&mclk 0x10 8>; clocks = <&gclk 26>, <&mclk 0x10 8>;
clock-names = "GCLK", "MCLK"; clock-names = "GCLK", "MCLK";
atmel,assigned-clocks = <&gclk 0>; atmel,assigned-clocks = <&gclk 7>;
atmel,assigned-clock-names = "GCLK"; atmel,assigned-clock-names = "GCLK";
status = "disabled"; status = "disabled";
bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
divider = <12>; divider = <1>;
}; };
can1: can@42002000 { can1: can@42002000 {
@ -76,12 +76,12 @@
interrupt-names = "int0"; interrupt-names = "int0";
clocks = <&gclk 27>, <&mclk 0x10 9>; clocks = <&gclk 27>, <&mclk 0x10 9>;
clock-names = "GCLK", "MCLK"; clock-names = "GCLK", "MCLK";
atmel,assigned-clocks = <&gclk 0>; atmel,assigned-clocks = <&gclk 7>;
atmel,assigned-clock-names = "GCLK"; atmel,assigned-clock-names = "GCLK";
status = "disabled"; status = "disabled";
bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
divider = <12>; divider = <1>;
}; };
}; };
}; };

8
dts/arm/atmel/same5x.dtsi
View File

@ -37,12 +37,12 @@
interrupt-names = "int0", "int1"; interrupt-names = "int0", "int1";
clocks = <&gclk 27>, <&mclk 0x10 17>; clocks = <&gclk 27>, <&mclk 0x10 17>;
clock-names = "GCLK", "MCLK"; clock-names = "GCLK", "MCLK";
atmel,assigned-clocks = <&gclk 0>; atmel,assigned-clocks = <&gclk 7>;
atmel,assigned-clock-names = "GCLK"; atmel,assigned-clock-names = "GCLK";
status = "disabled"; status = "disabled";
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
divider = <12>; divider = <1>;
}; };
can1: can@42000400 { can1: can@42000400 {
@ -52,12 +52,12 @@
interrupt-names = "int0", "int1"; interrupt-names = "int0", "int1";
clocks = <&gclk 28>, <&mclk 0x10 18>; clocks = <&gclk 28>, <&mclk 0x10 18>;
clock-names = "GCLK", "MCLK"; clock-names = "GCLK", "MCLK";
atmel,assigned-clocks = <&gclk 0>; atmel,assigned-clocks = <&gclk 7>;
atmel,assigned-clock-names = "GCLK"; atmel,assigned-clock-names = "GCLK";
status = "disabled"; status = "disabled";
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
divider = <12>; divider = <1>;
}; };
}; };
}; };