patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

dts: bindings: can: deprecate the sjw and sjw-data properties

Browse source 
Update the descriptions for the various CAN devicetree timing properties
specified in Time Quanta (TQ) to make it clear that these, if present, are
only used for the initial timing parameters.

Deprecate the (Re-)Synchronization Jump Width (SJW) devicetree properties
for both arbitration and data phase timing as these are now only used in
combination with the other TQ-based CAN timing properties, which are all
deprecated.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2023-09-22 12:18:22 +02:00 committed by Carles Cufí
parent a9d3935fa0
commit 9783ed56d9
57 changed files with 32 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boards/arm/mr_canhubk3/mr_canhubk3.dts
View file

@ -272,10 +272,8 @@
phys = <&can_phy0>; phys = <&can_phy0>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
status = "okay"; status = "okay";
}; };
@ -285,10 +283,8 @@
phys = <&can_phy1>; phys = <&can_phy1>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
}; };
&flexcan2 { &flexcan2 {
@ -297,10 +293,8 @@
phys = <&can_phy2>; phys = <&can_phy2>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
}; };
&flexcan3 { &flexcan3 {
@ -309,10 +303,8 @@
phys = <&can_phy3>; phys = <&can_phy3>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
}; };
&flexcan4 { &flexcan4 {
@ -321,10 +313,8 @@
phys = <&can_phy4>; phys = <&can_phy4>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
}; };
&flexcan5 { &flexcan5 {
@ -333,10 +323,8 @@
phys = <&can_phy5>; phys = <&can_phy5>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
}; };
&lpi2c0 { &lpi2c0 {

4
boards/arm/s32z270dc2_r52/s32z270dc2_r52.dtsi
View file

@ -52,10 +52,8 @@
pinctrl-names = "default"; pinctrl-names = "default";
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
status = "okay"; status = "okay";
}; };
@ -64,8 +62,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <875>; sample-point-data = <875>;
sjw-data = <1>;
}; };

2
boards/posix/native_posix/native_posix.dts
View file

@ -189,7 +189,6 @@
can_loopback0: can_loopback0 { can_loopback0: can_loopback0 {
status = "okay"; status = "okay";
compatible = "zephyr,can-loopback"; compatible = "zephyr,can-loopback";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
bus-speed = <125000>; bus-speed = <125000>;
}; };
@ -201,7 +200,6 @@
* name, e.g.: sudo ip link property add dev vcan0 altname zcan0 * name, e.g.: sudo ip link property add dev vcan0 altname zcan0
*/ */
host-interface = "zcan0"; host-interface = "zcan0";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
bus-speed = <125000>; bus-speed = <125000>;
}; };

1
boards/shields/mcp2515/adafruit_can_picowbell.overlay
View file

@ -16,7 +16,6 @@
reg = <0x0>; reg = <0x0>;
osc-freq = <16000000>; osc-freq = <16000000>;
bus-speed = <125000>; bus-speed = <125000>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
can-transceiver { can-transceiver {

1
boards/shields/mcp2515/dfrobot_can_bus_v2_0.overlay
View file

@ -16,7 +16,6 @@
reg = <0x0>; reg = <0x0>;
osc-freq = <16000000>; osc-freq = <16000000>;
bus-speed = <125000>; bus-speed = <125000>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
can-transceiver { can-transceiver {

1
boards/shields/mcp2515/keyestudio_can_bus_ks0411.overlay
View file

@ -16,7 +16,6 @@
reg = <0x0>; reg = <0x0>;
osc-freq = <16000000>; osc-freq = <16000000>;
bus-speed = <125000>; bus-speed = <125000>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
can-transceiver { can-transceiver {

2
boards/shields/tcan4550evm/tcan4550evm.overlay
View file

@ -28,8 +28,6 @@
reset-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>; /* D8 */ reset-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>; /* D8 */
int-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */ int-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */
bosch,mram-cfg = <0x0 15 15 7 7 0 10 10>; bosch,mram-cfg = <0x0 15 15 7 7 0 10 10>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
bus-speed = <125000>; bus-speed = <125000>;

1
boards/x86/qemu_x86/qemu_x86.dts
View file

@ -59,7 +59,6 @@
device-id = <0x8406>; device-id = <0x8406>;
interrupts = <11 IRQ_TYPE_LOWEST_LEVEL_LOW 3>; interrupts = <11 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
sjw = <1>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;

4
dts/arm/atmel/samc21.dtsi
View file

@ -53,9 +53,7 @@
clock-names = "GCLK", "MCLK"; clock-names = "GCLK", "MCLK";
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 = <12>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };
@ -69,9 +67,7 @@
clock-names = "GCLK", "MCLK"; clock-names = "GCLK", "MCLK";
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 = <12>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

4
dts/arm/atmel/same70.dtsi
View file

@ -417,9 +417,7 @@
clocks = <&pmc PMC_TYPE_PERIPHERAL 35>; clocks = <&pmc PMC_TYPE_PERIPHERAL 35>;
divider = <6>; divider = <6>;
bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };
@ -432,9 +430,7 @@
clocks = <&pmc PMC_TYPE_PERIPHERAL 37>; clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;
divider = <6>; divider = <6>;
bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/arm/nxp/nxp_k66.dtsi
View file

@ -31,7 +31,6 @@
"rx-warning", "wake-up"; "rx-warning", "wake-up";
clocks = <&sim KINETIS_SIM_BUS_CLK 0x1030 4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1030 4>;
clk-source = <1>; clk-source = <1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/arm/nxp/nxp_k6x.dtsi
View file

@ -504,7 +504,6 @@
interrupt-names = "mb-0-15", "bus-off", "error", "tx-warning", "rx-warning", "wake-up"; interrupt-names = "mb-0-15", "bus-off", "error", "tx-warning", "rx-warning", "wake-up";
clocks = <&sim KINETIS_SIM_BUS_CLK 0x103C 4>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x103C 4>;
clk-source = <1>; clk-source = <1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/nxp/nxp_ke1xf.dtsi
View file

@ -405,7 +405,6 @@
"mb-0-15"; "mb-0-15";
clocks = <&scg KINETIS_SCG_BUS_CLK>; clocks = <&scg KINETIS_SCG_BUS_CLK>;
clk-source = <1>; clk-source = <1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };
@ -418,7 +417,6 @@
"mb-0-15"; "mb-0-15";
clocks = <&scg KINETIS_SCG_BUS_CLK>; clocks = <&scg KINETIS_SCG_BUS_CLK>;
clk-source = <1>; clk-source = <1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/nxp/nxp_lpc55S0x_common.dtsi
View file

@ -223,9 +223,7 @@
interrupts = <43 0>, <44 0>; interrupts = <43 0>, <44 0>;
clocks = <&syscon MCUX_MCAN_CLK>; clocks = <&syscon MCUX_MCAN_CLK>;
bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>; bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/nxp/nxp_lpc55S1x_common.dtsi
View file

@ -218,9 +218,7 @@
interrupts = <43 0>, <44 0>; interrupts = <43 0>, <44 0>;
clocks = <&syscon MCUX_MCAN_CLK>; clocks = <&syscon MCUX_MCAN_CLK>;
bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>; bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/nxp/nxp_lpc55S3x_common.dtsi
View file

@ -328,9 +328,7 @@
interrupts = <43 0>, <44 0>; interrupts = <43 0>, <44 0>;
clocks = <&syscon MCUX_MCAN_CLK>; clocks = <&syscon MCUX_MCAN_CLK>;
bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>; bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

4
dts/arm/nxp/nxp_rt10xx.dtsi
View file

@ -868,7 +868,6 @@
interrupt-names = "common"; interrupt-names = "common";
clocks = <&ccm IMX_CCM_CAN_CLK 0x68 14>; clocks = <&ccm IMX_CCM_CAN_CLK 0x68 14>;
clk-source = <2>; clk-source = <2>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };
@ -880,7 +879,6 @@
interrupt-names = "common"; interrupt-names = "common";
clocks = <&ccm IMX_CCM_CAN_CLK 0x68 18>; clocks = <&ccm IMX_CCM_CAN_CLK 0x68 18>;
clk-source = <2>; clk-source = <2>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };
@ -892,8 +890,6 @@
interrupt-names = "common"; interrupt-names = "common";
clocks = <&ccm IMX_CCM_CAN_CLK 0x84 6>; clocks = <&ccm IMX_CCM_CAN_CLK 0x84 6>;
clk-source = <2>; clk-source = <2>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";

6
dts/arm/nxp/nxp_rt11xx.dtsi
View file

@ -808,8 +808,6 @@
interrupt-names = "common", "error"; interrupt-names = "common", "error";
clocks = <&ccm IMX_CCM_CAN1_CLK 0x68 14>; clocks = <&ccm IMX_CCM_CAN1_CLK 0x68 14>;
clk-source = <0>; clk-source = <0>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
@ -822,8 +820,6 @@
interrupt-names = "common", "error"; interrupt-names = "common", "error";
clocks = <&ccm IMX_CCM_CAN2_CLK 0x68 18>; clocks = <&ccm IMX_CCM_CAN2_CLK 0x68 18>;
clk-source = <0>; clk-source = <0>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
@ -836,8 +832,6 @@
interrupt-names = "common", "error"; interrupt-names = "common", "error";
clocks = <&ccm IMX_CCM_CAN3_CLK 0x84 6>; clocks = <&ccm IMX_CCM_CAN3_CLK 0x84 6>;
clk-source = <0>; clk-source = <0>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";

1
dts/arm/renesas/rcar/gen3/rcar_gen3_cr7.dtsi
View file

@ -94,7 +94,6 @@
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL
IRQ_DEFAULT_PRIORITY>; IRQ_DEFAULT_PRIORITY>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/arm/st/f0/stm32f042.dtsi
View file

@ -44,7 +44,6 @@
interrupts = <30 0>; interrupts = <30 0>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/f0/stm32f072.dtsi
View file

@ -16,7 +16,6 @@
interrupts = <30 0>; interrupts = <30 0>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/f0/stm32f091.dtsi
View file

@ -58,7 +58,6 @@
interrupts = <30 0>; interrupts = <30 0>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/f1/stm32f103X8.dtsi
View file

@ -54,7 +54,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
}; };

2
dts/arm/st/f1/stm32f105.dtsi
View file

@ -40,7 +40,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
@ -52,7 +51,6 @@
/* also enabling clock for can1 (master instance) */ /* also enabling clock for can1 (master instance) */
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/f3/stm32f3.dtsi
View file

@ -420,7 +420,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

2
dts/arm/st/f4/stm32f405.dtsi
View file

@ -212,7 +212,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
@ -225,7 +224,6 @@
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
master-can-reg = <0x40006400>; master-can-reg = <0x40006400>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

2
dts/arm/st/f4/stm32f412.dtsi
View file

@ -222,7 +222,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
@ -235,7 +234,6 @@
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
master-can-reg = <0x40006400>; master-can-reg = <0x40006400>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
}; };

1
dts/arm/st/f4/stm32f413.dtsi
View file

@ -79,7 +79,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x08000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x08000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
}; };

2
dts/arm/st/f4/stm32f446.dtsi
View file

@ -65,7 +65,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };
@ -78,7 +77,6 @@
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
master-can-reg = <0x40006400>; master-can-reg = <0x40006400>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/f7/stm32f7.dtsi
View file

@ -404,7 +404,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/f7/stm32f745.dtsi
View file

@ -72,7 +72,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x04000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x04000000>;
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

2
dts/arm/st/g0/stm32g0b1.dtsi
View file

@ -38,9 +38,7 @@
interrupt-names = "LINE_0", "LINE_1"; interrupt-names = "LINE_0", "LINE_1";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x00001000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x00001000>;
bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/st/g4/stm32g4.dtsi
View file

@ -390,9 +390,7 @@
interrupt-names = "LINE_0", "LINE_1"; interrupt-names = "LINE_0", "LINE_1";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/st/g4/stm32g473.dtsi
View file

@ -103,9 +103,7 @@
interrupt-names = "LINE_0", "LINE_1"; interrupt-names = "LINE_0", "LINE_1";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
bosch,mram-cfg = <0x6a0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x6a0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/st/g4/stm32g491.dtsi
View file

@ -17,10 +17,8 @@
interrupts = <86 0>, <87 0>; interrupts = <86 0>, <87 0>;
interrupt-names = "LINE_0", "LINE_1"; interrupt-names = "LINE_0", "LINE_1";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
sjw = <1>;
bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/st/h5/stm32h5.dtsi
View file

@ -442,9 +442,7 @@
interrupt-names = "LINE_0", "LINE_1"; interrupt-names = "LINE_0", "LINE_1";
clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>; clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>;
bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/st/h5/stm32h562.dtsi
View file

@ -303,9 +303,7 @@
/* common clock FDCAN 1 & 2 */ /* common clock FDCAN 1 & 2 */
clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>; clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>;
bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

4
dts/arm/st/h7/stm32h7.dtsi
View file

@ -475,9 +475,7 @@
interrupts = <19 0>, <21 0>, <63 0>; interrupts = <19 0>, <21 0>, <63 0>;
interrupt-names = "LINE_0", "LINE_1", "CALIB"; interrupt-names = "LINE_0", "LINE_1", "CALIB";
bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };
@ -490,9 +488,7 @@
interrupts = <20 0>, <22 0>, <63 0>; interrupts = <20 0>, <22 0>, <63 0>;
interrupt-names = "LINE_0", "LINE_1", "CALIB"; interrupt-names = "LINE_0", "LINE_1", "CALIB";
bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

2
dts/arm/st/h7/stm32h723.dtsi
View file

@ -123,9 +123,7 @@
interrupts = <159 0>, <160 0>, <63 0>; interrupts = <159 0>, <160 0>, <63 0>;
interrupt-names = "LINE_0", "LINE_1", "CALIB"; interrupt-names = "LINE_0", "LINE_1", "CALIB";
bosch,mram-cfg = <0x6a0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x6a0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/arm/st/l4/stm32l431.dtsi
View file

@ -107,7 +107,6 @@
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>; interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/arm/st/l4/stm32l432.dtsi
View file

@ -57,7 +57,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/l4/stm32l451.dtsi
View file

@ -141,7 +141,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/l4/stm32l471.dtsi
View file

@ -232,7 +232,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/l4/stm32l496.dtsi
View file

@ -55,7 +55,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x04000000>; //RCC_APB1ENR1_CAN2EN clocks = <&rcc STM32_CLOCK_BUS_APB1 0x04000000>; //RCC_APB1ENR1_CAN2EN
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

1
dts/arm/st/l4/stm32l4p5.dtsi
View file

@ -291,7 +291,6 @@
interrupt-names = "TX", "RX0", "RX1", "SCE"; interrupt-names = "TX", "RX0", "RX1", "SCE";
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN
status = "disabled"; status = "disabled";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
}; };

2
dts/arm/st/u5/stm32u5.dtsi
View file

@ -777,9 +777,7 @@
interrupt-names = "LINE_0", "LINE_1"; interrupt-names = "LINE_0", "LINE_1";
clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>; clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>;
bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
sample-point-data = <875>; sample-point-data = <875>;
status = "disabled"; status = "disabled";
}; };

24
dts/bindings/can/can-controller.yaml
View file

@ -9,26 +9,34 @@ properties:
description: bus speed in Baud/s description: bus speed in Baud/s
sjw: sjw:
type: int type: int
required: true deprecated: true
description: Resynchronization jump width (ISO 11898-1) default: 1
description: |
Initial time quanta of resynchronization jump width (ISO 11898-1).
Deprecated in favor of automatic calculation of a suitable default SJW based on existing
timing parameters. Default of 1 matches the default value previously used for all in-tree CAN
controller devicetree instances.
Applications can still manually set the SJW using the CAN timing APIs.
prop-seg: prop-seg:
type: int type: int
deprecated: true deprecated: true
description: | description: |
Time quantums of propagation segment (ISO 11898-1). Deprecated in favor of setting advanced Initial time quanta of propagation segment (ISO 11898-1). Deprecated in favor of setting
timing parameters from the application. advanced timing parameters from the application.
phase-seg1: phase-seg1:
type: int type: int
deprecated: true deprecated: true
description: | description: |
Time quantums of phase buffer 1 segment (ISO 11898-1). Deprecated in favor of setting advanced Initial time quanta of phase buffer 1 segment (ISO 11898-1). Deprecated in favor of setting
timing parameters from the application. advanced timing parameters from the application.
phase-seg2: phase-seg2:
type: int type: int
deprecated: true deprecated: true
description: | description: |
Time quantums of phase buffer 2 segment (ISO 11898-1). Deprecated in favor of setting advanced Initial time quanta of phase buffer 2 segment (ISO 11898-1). Deprecated in favor of setting
timing parameters from the application. advanced timing parameters from the application.
sample-point: sample-point:
type: int type: int
description: > description: >

24
dts/bindings/can/can-fd-controller.yaml
View file

@ -9,26 +9,34 @@ properties:
description: data phase bus speed in Baud/s description: data phase bus speed in Baud/s
sjw-data: sjw-data:
type: int type: int
required: true deprecated: true
description: Resynchronization jump width for the data phase. (ISO11898-1:2015) default: 1
description: |
Initial time quanta of resynchronization jump width for the data phase (ISO11898-1:2015).
Deprecated in favor of automatic calculation of a suitable default SJW based on existing
timing parameters. Default of 1 matches the default value previously used for all in-tree CAN
controller devicetree instances.
Applications can still manually set the SJW using the CAN timing APIs.
prop-seg-data: prop-seg-data:
type: int type: int
deprecated: true deprecated: true
description: | description: |
Time quantums of propagation segment for the data phase (ISO11898-1:2015). Deprecated in favor Initial time quanta of propagation segment for the data phase (ISO11898-1:2015). Deprecated in
of setting advanced timing parameters from the application. favor of setting advanced timing parameters from the application.
phase-seg1-data: phase-seg1-data:
type: int type: int
deprecated: true deprecated: true
description: | description: |
Time quantums of phase buffer 1 segment for the data phase (ISO11898-1:2015). Deprecated in Initial time quanta of phase buffer 1 segment for the data phase (ISO11898-1:2015). Deprecated
favor of setting advanced timing parameters from the application. in favor of setting advanced timing parameters from the application.
phase-seg2-data: phase-seg2-data:
type: int type: int
deprecated: true deprecated: true
description: | description: |
Time quantums of phase buffer 2 segment for the data phase (ISO11898-1:2015). Deprecated in Initial time quanta of phase buffer 2 segment for the data phase (ISO11898-1:2015). Deprecated
favor of setting advanced timing parameters from the application. in favor of setting advanced timing parameters from the application.
sample-point-data: sample-point-data:
type: int type: int
description: > description: >

2
dts/bindings/can/nxp,flexcan-fd.yaml
View file

@ -15,8 +15,6 @@ description: |
interrupt-names = "common"; interrupt-names = "common";
clocks = <&ccm IMX_CCM_CAN_CLK 0x84 6>; clocks = <&ccm IMX_CCM_CAN_CLK 0x84 6>;
clk-source = <2>; clk-source = <2>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
bus-speed = <125000>; bus-speed = <125000>;

1
dts/bindings/can/nxp,flexcan.yaml
View file

@ -13,7 +13,6 @@ description: |
interrupt-names = "warning", "error", "wake-up", "mb-0-15"; interrupt-names = "warning", "error", "wake-up", "mb-0-15";
clocks = <&scg KINETIS_SCG_BUS_CLK>; clocks = <&scg KINETIS_SCG_BUS_CLK>;
clk-source = <1>; clk-source = <1>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
bus-speed = <125000>; bus-speed = <125000>;
pinctrl-0 = <&pinmux_flexcan0>; pinctrl-0 = <&pinmux_flexcan0>;

2
dts/bindings/can/ti,tcan4x5x.yaml
View file

@ -16,8 +16,6 @@ description: |
reset-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
int-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; int-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
bosch,mram-cfg = <0x0 15 15 5 5 0 10 10>; bosch,mram-cfg = <0x0 15 15 5 5 0 10 10>;
sjw = <1>;
sjw-data = <1>;
sample-point = <875>; sample-point = <875>;
sample-point-data = <875>; sample-point-data = <875>;
bus-speed = <125000>; bus-speed = <125000>;

1
dts/riscv/espressif/esp32c3/esp32c3_common.dtsi
View file

@ -218,7 +218,6 @@
interrupts = <TWAI_INTR_SOURCE>; interrupts = <TWAI_INTR_SOURCE>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
clocks = <&rtc ESP32_TWAI_MODULE>; clocks = <&rtc ESP32_TWAI_MODULE>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/xtensa/espressif/esp32/esp32_common.dtsi
View file

@ -344,7 +344,6 @@
interrupts = <TWAI_INTR_SOURCE>; interrupts = <TWAI_INTR_SOURCE>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
clocks = <&rtc ESP32_TWAI_MODULE>; clocks = <&rtc ESP32_TWAI_MODULE>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi
View file

@ -331,7 +331,6 @@
interrupts = <TWAI_INTR_SOURCE>; interrupts = <TWAI_INTR_SOURCE>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
clocks = <&rtc ESP32_TWAI_MODULE>; clocks = <&rtc ESP32_TWAI_MODULE>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

1
dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi
View file

@ -261,7 +261,6 @@
interrupts = <TWAI_INTR_SOURCE>; interrupts = <TWAI_INTR_SOURCE>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
clocks = <&rtc ESP32_TWAI_MODULE>; clocks = <&rtc ESP32_TWAI_MODULE>;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
status = "disabled"; status = "disabled";
}; };

2
tests/drivers/can/shell/app.overlay
View file

@ -8,11 +8,9 @@
fake_can: fake_can { fake_can: fake_can {
compatible = "zephyr,fake-can"; compatible = "zephyr,fake-can";
status = "okay"; status = "okay";
sjw = <1>;
sample-point = <875>; sample-point = <875>;
bus-speed = <125000>; bus-speed = <125000>;
sample-point = <875>; sample-point = <875>;
sjw-data = <1>;
bus-speed-data = <1000000>; bus-speed-data = <1000000>;
sample-point-data = <750>; sample-point-data = <750>;
}; };

2
tests/lib/devicetree/api/app.overlay
View file

@ -483,7 +483,6 @@
test_can0: can@55553333 { test_can0: can@55553333 {
compatible = "vnd,can-controller"; compatible = "vnd,can-controller";
reg = < 0x55553333 0x1000 >; reg = < 0x55553333 0x1000 >;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
bus-speed = <125000>; bus-speed = <125000>;
status = "okay"; status = "okay";
@ -493,7 +492,6 @@
test_can1: can@55554444 { test_can1: can@55554444 {
compatible = "vnd,can-controller"; compatible = "vnd,can-controller";
reg = < 0x55554444 0x1000 >; reg = < 0x55554444 0x1000 >;
sjw = <1>;
sample-point = <875>; sample-point = <875>;
bus-speed = <125000>; bus-speed = <125000>;
status = "okay"; status = "okay";