diff --git a/boards/arm/nucleo_f746zg/nucleo_f746zg.dts b/boards/arm/nucleo_f746zg/nucleo_f746zg.dts index cb59eddad63..004f203c9ca 100644 --- a/boards/arm/nucleo_f746zg/nucleo_f746zg.dts +++ b/boards/arm/nucleo_f746zg/nucleo_f746zg.dts @@ -104,8 +104,9 @@ arduino_spi: &spi1 {}; &can1 { bus-speed = <125000>; sjw = <1>; - prop_seg_phase_seg1 = <6>; - phase_seg2 = <5>; + prop-seg = <0>; + phase-seg1 = <6>; + phase-seg2 = <5>; status = "okay"; }; diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c index f82487cce41..babd9088dac 100644 --- a/drivers/can/can_stm32.c +++ b/drivers/can/can_stm32.c @@ -820,7 +820,7 @@ static const struct can_stm32_config can_stm32_cfg_1 = { .can = (CAN_TypeDef *)DT_CAN_1_BASE_ADDRESS, .bus_speed = DT_CAN_1_BUS_SPEED, .sjw = DT_CAN_1_SJW, - .prop_bs1 = DT_CAN_1_PROP_SEG_PHASE_SEG1, + .prop_bs1 = DT_CAN_1_PROP_SEG + DT_CAN_1_PHASE_SEG1, .bs2 = DT_CAN_1_PHASE_SEG2, .pclken = { .enr = DT_CAN_1_CLOCK_BITS, diff --git a/dts/arm/st/f0/stm32f072.dtsi b/dts/arm/st/f0/stm32f072.dtsi index ea5ba48f15f..1b3267a5064 100644 --- a/dts/arm/st/f0/stm32f072.dtsi +++ b/dts/arm/st/f0/stm32f072.dtsi @@ -76,8 +76,9 @@ label = "CAN_1"; bus-speed = <250000>; sjw = <1>; - prop_seg_phase_seg1 = <5>; - phase_seg2 = <6>; + prop-seg = <0>; + phase-seg1 = <5>; + phase-seg2 = <6>; }; }; diff --git a/dts/arm/st/l4/stm32l4.dtsi b/dts/arm/st/l4/stm32l4.dtsi index 826a15b0ae6..4ab04676dae 100644 --- a/dts/arm/st/l4/stm32l4.dtsi +++ b/dts/arm/st/l4/stm32l4.dtsi @@ -278,8 +278,9 @@ label = "CAN_1"; bus-speed = <125000>; sjw = <1>; - prop_seg_phase_seg1 = <4>; - phase_seg2 = <5>; + prop-seg = <0>; + phase-seg1 = <4>; + phase-seg2 = <5>; }; rtc: rtc@40002800 { diff --git a/dts/bindings/can/can.yaml b/dts/bindings/can/can.yaml index 3e15576d6f7..ed98b9eedec 100644 --- a/dts/bindings/can/can.yaml +++ b/dts/bindings/can/can.yaml @@ -32,12 +32,17 @@ properties: category: required description: Resynchronization jump width (ISO 11898-1) generation: define - prop_seg_phase_seg1: + prop-seg: type: int category: required - description: Time quantums of phase buffer 1 segment + propagation segment (ISO 11898-1) + description: Time quantums of propagation segment (ISO 11898-1) generation: define - phase_seg2: + phase-seg1: + type: int + category: required + description: Time quantums of phase buffer 1 segment (ISO 11898-1) + generation: define + phase-seg2: type: int category: required description: Time quantums of phase buffer 2 segment (ISO 11898-1) diff --git a/soc/arm/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index 2f5ca81b405..146683df541 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -113,7 +113,8 @@ #define DT_CAN_1_IRQ DT_ST_STM32_CAN_40006400_IRQ_0 #define DT_CAN_1_IRQ_PRIORITY DT_ST_STM32_CAN_40006400_IRQ_0_PRIORITY #define DT_CAN_1_SJW DT_ST_STM32_CAN_40006400_SJW -#define DT_CAN_1_PROP_SEG_PHASE_SEG1 DT_ST_STM32_CAN_40006400_PROP_SEG_PHASE_SEG1 +#define DT_CAN_1_PROP_SEG DT_ST_STM32_CAN_40006400_PROP_SEG +#define DT_CAN_1_PHASE_SEG1 DT_ST_STM32_CAN_40006400_PHASE_SEG1 #define DT_CAN_1_PHASE_SEG2 DT_ST_STM32_CAN_40006400_PHASE_SEG2 #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index f173bd076af..f6102f37e3a 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -382,7 +382,8 @@ #define DT_CAN_1_IRQ_SCE DT_ST_STM32_CAN_40006400_IRQ_SCE #define DT_CAN_1_IRQ_PRIORITY DT_ST_STM32_CAN_40006400_IRQ_0_PRIORITY #define DT_CAN_1_SJW DT_ST_STM32_CAN_40006400_SJW -#define DT_CAN_1_PROP_SEG_PHASE_SEG1 DT_ST_STM32_CAN_40006400_PROP_SEG_PHASE_SEG1 +#define DT_CAN_1_PROP_SEG DT_ST_STM32_CAN_40006400_PROP_SEG +#define DT_CAN_1_PHASE_SEG1 DT_ST_STM32_CAN_40006400_PHASE_SEG1 #define DT_CAN_1_PHASE_SEG2 DT_ST_STM32_CAN_40006400_PHASE_SEG2 #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index a9940553937..1c8f65f1b66 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -304,7 +304,8 @@ #define DT_CAN_1_IRQ_SCE DT_ST_STM32_CAN_40006400_IRQ_SCE #define DT_CAN_1_IRQ_PRIORITY DT_ST_STM32_CAN_40006400_IRQ_0_PRIORITY #define DT_CAN_1_SJW DT_ST_STM32_CAN_40006400_SJW -#define DT_CAN_1_PROP_SEG_PHASE_SEG1 DT_ST_STM32_CAN_40006400_PROP_SEG_PHASE_SEG1 +#define DT_CAN_1_PROP_SEG DT_ST_STM32_CAN_40006400_PROP_SEG +#define DT_CAN_1_PHASE_SEG1 DT_ST_STM32_CAN_40006400_PHASE_SEG1 #define DT_CAN_1_PHASE_SEG2 DT_ST_STM32_CAN_40006400_PHASE_SEG2 #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS