From 9783ed56d936949f353beecf3e2b6efc6e4728f1 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Fri, 22 Sep 2023 12:18:22 +0200 Subject: [PATCH] dts: bindings: can: deprecate the sjw and sjw-data properties 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 --- boards/arm/mr_canhubk3/mr_canhubk3.dts | 12 ---------- boards/arm/s32z270dc2_r52/s32z270dc2_r52.dtsi | 4 ---- boards/posix/native_posix/native_posix.dts | 2 -- .../mcp2515/adafruit_can_picowbell.overlay | 1 - .../mcp2515/dfrobot_can_bus_v2_0.overlay | 1 - .../mcp2515/keyestudio_can_bus_ks0411.overlay | 1 - .../shields/tcan4550evm/tcan4550evm.overlay | 2 -- boards/x86/qemu_x86/qemu_x86.dts | 1 - dts/arm/atmel/samc21.dtsi | 4 ---- dts/arm/atmel/same70.dtsi | 4 ---- dts/arm/nxp/nxp_k66.dtsi | 1 - dts/arm/nxp/nxp_k6x.dtsi | 1 - dts/arm/nxp/nxp_ke1xf.dtsi | 2 -- dts/arm/nxp/nxp_lpc55S0x_common.dtsi | 2 -- dts/arm/nxp/nxp_lpc55S1x_common.dtsi | 2 -- dts/arm/nxp/nxp_lpc55S3x_common.dtsi | 2 -- dts/arm/nxp/nxp_rt10xx.dtsi | 4 ---- dts/arm/nxp/nxp_rt11xx.dtsi | 6 ----- dts/arm/renesas/rcar/gen3/rcar_gen3_cr7.dtsi | 1 - dts/arm/st/f0/stm32f042.dtsi | 1 - dts/arm/st/f0/stm32f072.dtsi | 1 - dts/arm/st/f0/stm32f091.dtsi | 1 - dts/arm/st/f1/stm32f103X8.dtsi | 1 - dts/arm/st/f1/stm32f105.dtsi | 2 -- dts/arm/st/f3/stm32f3.dtsi | 1 - dts/arm/st/f4/stm32f405.dtsi | 2 -- dts/arm/st/f4/stm32f412.dtsi | 2 -- dts/arm/st/f4/stm32f413.dtsi | 1 - dts/arm/st/f4/stm32f446.dtsi | 2 -- dts/arm/st/f7/stm32f7.dtsi | 1 - dts/arm/st/f7/stm32f745.dtsi | 1 - dts/arm/st/g0/stm32g0b1.dtsi | 2 -- dts/arm/st/g4/stm32g4.dtsi | 2 -- dts/arm/st/g4/stm32g473.dtsi | 2 -- dts/arm/st/g4/stm32g491.dtsi | 2 -- dts/arm/st/h5/stm32h5.dtsi | 2 -- dts/arm/st/h5/stm32h562.dtsi | 2 -- dts/arm/st/h7/stm32h7.dtsi | 4 ---- dts/arm/st/h7/stm32h723.dtsi | 2 -- dts/arm/st/l4/stm32l431.dtsi | 1 - dts/arm/st/l4/stm32l432.dtsi | 1 - dts/arm/st/l4/stm32l451.dtsi | 1 - dts/arm/st/l4/stm32l471.dtsi | 1 - dts/arm/st/l4/stm32l496.dtsi | 1 - dts/arm/st/l4/stm32l4p5.dtsi | 1 - dts/arm/st/u5/stm32u5.dtsi | 2 -- dts/bindings/can/can-controller.yaml | 24 ++++++++++++------- dts/bindings/can/can-fd-controller.yaml | 24 ++++++++++++------- dts/bindings/can/nxp,flexcan-fd.yaml | 2 -- dts/bindings/can/nxp,flexcan.yaml | 1 - dts/bindings/can/ti,tcan4x5x.yaml | 2 -- .../espressif/esp32c3/esp32c3_common.dtsi | 1 - dts/xtensa/espressif/esp32/esp32_common.dtsi | 1 - .../espressif/esp32s2/esp32s2_common.dtsi | 1 - .../espressif/esp32s3/esp32s3_common.dtsi | 1 - tests/drivers/can/shell/app.overlay | 2 -- tests/lib/devicetree/api/app.overlay | 2 -- 57 files changed, 32 insertions(+), 124 deletions(-) diff --git a/boards/arm/mr_canhubk3/mr_canhubk3.dts b/boards/arm/mr_canhubk3/mr_canhubk3.dts index 8eb00eb12d..a89047e926 100644 --- a/boards/arm/mr_canhubk3/mr_canhubk3.dts +++ b/boards/arm/mr_canhubk3/mr_canhubk3.dts @@ -272,10 +272,8 @@ phys = <&can_phy0>; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; status = "okay"; }; @@ -285,10 +283,8 @@ phys = <&can_phy1>; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; }; &flexcan2 { @@ -297,10 +293,8 @@ phys = <&can_phy2>; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; }; &flexcan3 { @@ -309,10 +303,8 @@ phys = <&can_phy3>; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; }; &flexcan4 { @@ -321,10 +313,8 @@ phys = <&can_phy4>; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; }; &flexcan5 { @@ -333,10 +323,8 @@ phys = <&can_phy5>; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; }; &lpi2c0 { diff --git a/boards/arm/s32z270dc2_r52/s32z270dc2_r52.dtsi b/boards/arm/s32z270dc2_r52/s32z270dc2_r52.dtsi index ba602aadd1..6bf924802f 100644 --- a/boards/arm/s32z270dc2_r52/s32z270dc2_r52.dtsi +++ b/boards/arm/s32z270dc2_r52/s32z270dc2_r52.dtsi @@ -52,10 +52,8 @@ pinctrl-names = "default"; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; status = "okay"; }; @@ -64,8 +62,6 @@ pinctrl-names = "default"; bus-speed = <125000>; sample-point = <875>; - sjw = <1>; bus-speed-data = <1000000>; sample-point-data = <875>; - sjw-data = <1>; }; diff --git a/boards/posix/native_posix/native_posix.dts b/boards/posix/native_posix/native_posix.dts index 124cc18896..75af8bdb1f 100644 --- a/boards/posix/native_posix/native_posix.dts +++ b/boards/posix/native_posix/native_posix.dts @@ -189,7 +189,6 @@ can_loopback0: can_loopback0 { status = "okay"; compatible = "zephyr,can-loopback"; - sjw = <1>; sample-point = <875>; bus-speed = <125000>; }; @@ -201,7 +200,6 @@ * name, e.g.: sudo ip link property add dev vcan0 altname zcan0 */ host-interface = "zcan0"; - sjw = <1>; sample-point = <875>; bus-speed = <125000>; }; diff --git a/boards/shields/mcp2515/adafruit_can_picowbell.overlay b/boards/shields/mcp2515/adafruit_can_picowbell.overlay index 861839de9c..163d795831 100644 --- a/boards/shields/mcp2515/adafruit_can_picowbell.overlay +++ b/boards/shields/mcp2515/adafruit_can_picowbell.overlay @@ -16,7 +16,6 @@ reg = <0x0>; osc-freq = <16000000>; bus-speed = <125000>; - sjw = <1>; sample-point = <875>; can-transceiver { diff --git a/boards/shields/mcp2515/dfrobot_can_bus_v2_0.overlay b/boards/shields/mcp2515/dfrobot_can_bus_v2_0.overlay index 04130f2941..397fac2ef7 100644 --- a/boards/shields/mcp2515/dfrobot_can_bus_v2_0.overlay +++ b/boards/shields/mcp2515/dfrobot_can_bus_v2_0.overlay @@ -16,7 +16,6 @@ reg = <0x0>; osc-freq = <16000000>; bus-speed = <125000>; - sjw = <1>; sample-point = <875>; can-transceiver { diff --git a/boards/shields/mcp2515/keyestudio_can_bus_ks0411.overlay b/boards/shields/mcp2515/keyestudio_can_bus_ks0411.overlay index 79d2365ca3..43089f65d8 100644 --- a/boards/shields/mcp2515/keyestudio_can_bus_ks0411.overlay +++ b/boards/shields/mcp2515/keyestudio_can_bus_ks0411.overlay @@ -16,7 +16,6 @@ reg = <0x0>; osc-freq = <16000000>; bus-speed = <125000>; - sjw = <1>; sample-point = <875>; can-transceiver { diff --git a/boards/shields/tcan4550evm/tcan4550evm.overlay b/boards/shields/tcan4550evm/tcan4550evm.overlay index 8874dbdffd..61c62ef4c0 100644 --- a/boards/shields/tcan4550evm/tcan4550evm.overlay +++ b/boards/shields/tcan4550evm/tcan4550evm.overlay @@ -28,8 +28,6 @@ reset-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>; /* D8 */ int-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */ bosch,mram-cfg = <0x0 15 15 7 7 0 10 10>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; bus-speed = <125000>; diff --git a/boards/x86/qemu_x86/qemu_x86.dts b/boards/x86/qemu_x86/qemu_x86.dts index 806e1cad8b..62dfaf57b0 100644 --- a/boards/x86/qemu_x86/qemu_x86.dts +++ b/boards/x86/qemu_x86/qemu_x86.dts @@ -59,7 +59,6 @@ device-id = <0x8406>; interrupts = <11 IRQ_TYPE_LOWEST_LEVEL_LOW 3>; interrupt-parent = <&intc>; - sjw = <1>; bus-speed = <125000>; sample-point = <875>; diff --git a/dts/arm/atmel/samc21.dtsi b/dts/arm/atmel/samc21.dtsi index 63421dbdb6..d3cdfbda77 100644 --- a/dts/arm/atmel/samc21.dtsi +++ b/dts/arm/atmel/samc21.dtsi @@ -53,9 +53,7 @@ clock-names = "GCLK", "MCLK"; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; divider = <12>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; @@ -69,9 +67,7 @@ clock-names = "GCLK", "MCLK"; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; divider = <12>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/atmel/same70.dtsi b/dts/arm/atmel/same70.dtsi index cd021e8a3b..7256a2bc0b 100644 --- a/dts/arm/atmel/same70.dtsi +++ b/dts/arm/atmel/same70.dtsi @@ -417,9 +417,7 @@ clocks = <&pmc PMC_TYPE_PERIPHERAL 35>; divider = <6>; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; @@ -432,9 +430,7 @@ clocks = <&pmc PMC_TYPE_PERIPHERAL 37>; divider = <6>; bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_k66.dtsi b/dts/arm/nxp/nxp_k66.dtsi index 6ee4f202f4..2c2470fcf8 100644 --- a/dts/arm/nxp/nxp_k66.dtsi +++ b/dts/arm/nxp/nxp_k66.dtsi @@ -31,7 +31,6 @@ "rx-warning", "wake-up"; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1030 4>; clk-source = <1>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index 661be1478c..909e07e379 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -504,7 +504,6 @@ interrupt-names = "mb-0-15", "bus-off", "error", "tx-warning", "rx-warning", "wake-up"; clocks = <&sim KINETIS_SIM_BUS_CLK 0x103C 4>; clk-source = <1>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi index e0ad94d089..0a834b2b67 100644 --- a/dts/arm/nxp/nxp_ke1xf.dtsi +++ b/dts/arm/nxp/nxp_ke1xf.dtsi @@ -405,7 +405,6 @@ "mb-0-15"; clocks = <&scg KINETIS_SCG_BUS_CLK>; clk-source = <1>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; @@ -418,7 +417,6 @@ "mb-0-15"; clocks = <&scg KINETIS_SCG_BUS_CLK>; clk-source = <1>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_lpc55S0x_common.dtsi b/dts/arm/nxp/nxp_lpc55S0x_common.dtsi index 9f7abe6169..ca7a25b765 100644 --- a/dts/arm/nxp/nxp_lpc55S0x_common.dtsi +++ b/dts/arm/nxp/nxp_lpc55S0x_common.dtsi @@ -223,9 +223,7 @@ interrupts = <43 0>, <44 0>; clocks = <&syscon MCUX_MCAN_CLK>; bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_lpc55S1x_common.dtsi b/dts/arm/nxp/nxp_lpc55S1x_common.dtsi index c6b21b7495..9e4ee4841d 100644 --- a/dts/arm/nxp/nxp_lpc55S1x_common.dtsi +++ b/dts/arm/nxp/nxp_lpc55S1x_common.dtsi @@ -218,9 +218,7 @@ interrupts = <43 0>, <44 0>; clocks = <&syscon MCUX_MCAN_CLK>; bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_lpc55S3x_common.dtsi b/dts/arm/nxp/nxp_lpc55S3x_common.dtsi index 24b326f2ce..381a0b0739 100644 --- a/dts/arm/nxp/nxp_lpc55S3x_common.dtsi +++ b/dts/arm/nxp/nxp_lpc55S3x_common.dtsi @@ -328,9 +328,7 @@ interrupts = <43 0>, <44 0>; clocks = <&syscon MCUX_MCAN_CLK>; bosch,mram-cfg = <0x0 15 15 8 8 0 15 15>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/nxp/nxp_rt10xx.dtsi b/dts/arm/nxp/nxp_rt10xx.dtsi index 1f1ff41609..fede96dece 100644 --- a/dts/arm/nxp/nxp_rt10xx.dtsi +++ b/dts/arm/nxp/nxp_rt10xx.dtsi @@ -868,7 +868,6 @@ interrupt-names = "common"; clocks = <&ccm IMX_CCM_CAN_CLK 0x68 14>; clk-source = <2>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; @@ -880,7 +879,6 @@ interrupt-names = "common"; clocks = <&ccm IMX_CCM_CAN_CLK 0x68 18>; clk-source = <2>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; @@ -892,8 +890,6 @@ interrupt-names = "common"; clocks = <&ccm IMX_CCM_CAN_CLK 0x84 6>; clk-source = <2>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; status = "disabled"; diff --git a/dts/arm/nxp/nxp_rt11xx.dtsi b/dts/arm/nxp/nxp_rt11xx.dtsi index 0deede76c3..ee61909255 100644 --- a/dts/arm/nxp/nxp_rt11xx.dtsi +++ b/dts/arm/nxp/nxp_rt11xx.dtsi @@ -808,8 +808,6 @@ interrupt-names = "common", "error"; clocks = <&ccm IMX_CCM_CAN1_CLK 0x68 14>; clk-source = <0>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; status = "disabled"; @@ -822,8 +820,6 @@ interrupt-names = "common", "error"; clocks = <&ccm IMX_CCM_CAN2_CLK 0x68 18>; clk-source = <0>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; status = "disabled"; @@ -836,8 +832,6 @@ interrupt-names = "common", "error"; clocks = <&ccm IMX_CCM_CAN3_CLK 0x84 6>; clk-source = <0>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; status = "disabled"; diff --git a/dts/arm/renesas/rcar/gen3/rcar_gen3_cr7.dtsi b/dts/arm/renesas/rcar/gen3/rcar_gen3_cr7.dtsi index 549443ee99..0f1cecf7d8 100644 --- a/dts/arm/renesas/rcar/gen3/rcar_gen3_cr7.dtsi +++ b/dts/arm/renesas/rcar/gen3/rcar_gen3_cr7.dtsi @@ -94,7 +94,6 @@ interrupt-parent = <&gic>; interrupts = ; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/arm/st/f0/stm32f042.dtsi b/dts/arm/st/f0/stm32f042.dtsi index e8aed739bd..52744d1ff4 100644 --- a/dts/arm/st/f0/stm32f042.dtsi +++ b/dts/arm/st/f0/stm32f042.dtsi @@ -44,7 +44,6 @@ interrupts = <30 0>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f0/stm32f072.dtsi b/dts/arm/st/f0/stm32f072.dtsi index 368ea324e4..1c7ad8b1b6 100644 --- a/dts/arm/st/f0/stm32f072.dtsi +++ b/dts/arm/st/f0/stm32f072.dtsi @@ -16,7 +16,6 @@ interrupts = <30 0>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f0/stm32f091.dtsi b/dts/arm/st/f0/stm32f091.dtsi index 2b68394f50..b1ad8f0646 100644 --- a/dts/arm/st/f0/stm32f091.dtsi +++ b/dts/arm/st/f0/stm32f091.dtsi @@ -58,7 +58,6 @@ interrupts = <30 0>; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f1/stm32f103X8.dtsi b/dts/arm/st/f1/stm32f103X8.dtsi index a70d4c83a3..ae7150291b 100644 --- a/dts/arm/st/f1/stm32f103X8.dtsi +++ b/dts/arm/st/f1/stm32f103X8.dtsi @@ -54,7 +54,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; }; diff --git a/dts/arm/st/f1/stm32f105.dtsi b/dts/arm/st/f1/stm32f105.dtsi index 9ff6104bf1..1a2ec793d9 100644 --- a/dts/arm/st/f1/stm32f105.dtsi +++ b/dts/arm/st/f1/stm32f105.dtsi @@ -40,7 +40,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; @@ -52,7 +51,6 @@ /* also enabling clock for can1 (master instance) */ clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f3/stm32f3.dtsi b/dts/arm/st/f3/stm32f3.dtsi index bef28bd44d..a426a84ea3 100644 --- a/dts/arm/st/f3/stm32f3.dtsi +++ b/dts/arm/st/f3/stm32f3.dtsi @@ -420,7 +420,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f4/stm32f405.dtsi b/dts/arm/st/f4/stm32f405.dtsi index 445c7df7b9..a462d48a26 100644 --- a/dts/arm/st/f4/stm32f405.dtsi +++ b/dts/arm/st/f4/stm32f405.dtsi @@ -212,7 +212,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; @@ -225,7 +224,6 @@ clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; master-can-reg = <0x40006400>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f4/stm32f412.dtsi b/dts/arm/st/f4/stm32f412.dtsi index bf15b9f67f..07f93afc96 100644 --- a/dts/arm/st/f4/stm32f412.dtsi +++ b/dts/arm/st/f4/stm32f412.dtsi @@ -222,7 +222,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; @@ -235,7 +234,6 @@ clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; master-can-reg = <0x40006400>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; }; diff --git a/dts/arm/st/f4/stm32f413.dtsi b/dts/arm/st/f4/stm32f413.dtsi index 17d8137bad..ac61c7d351 100644 --- a/dts/arm/st/f4/stm32f413.dtsi +++ b/dts/arm/st/f4/stm32f413.dtsi @@ -79,7 +79,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x08000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; }; diff --git a/dts/arm/st/f4/stm32f446.dtsi b/dts/arm/st/f4/stm32f446.dtsi index d7039c4ff1..7b15fe2a9c 100644 --- a/dts/arm/st/f4/stm32f446.dtsi +++ b/dts/arm/st/f4/stm32f446.dtsi @@ -65,7 +65,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; @@ -78,7 +77,6 @@ clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>; master-can-reg = <0x40006400>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f7/stm32f7.dtsi b/dts/arm/st/f7/stm32f7.dtsi index 87bb8545b7..2df24d0c8d 100644 --- a/dts/arm/st/f7/stm32f7.dtsi +++ b/dts/arm/st/f7/stm32f7.dtsi @@ -404,7 +404,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/f7/stm32f745.dtsi b/dts/arm/st/f7/stm32f745.dtsi index 895525f9bc..d63ddd881b 100644 --- a/dts/arm/st/f7/stm32f745.dtsi +++ b/dts/arm/st/f7/stm32f745.dtsi @@ -72,7 +72,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x04000000>; status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/g0/stm32g0b1.dtsi b/dts/arm/st/g0/stm32g0b1.dtsi index fd65aa54c0..621214b080 100644 --- a/dts/arm/st/g0/stm32g0b1.dtsi +++ b/dts/arm/st/g0/stm32g0b1.dtsi @@ -38,9 +38,7 @@ interrupt-names = "LINE_0", "LINE_1"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x00001000>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/g4/stm32g4.dtsi b/dts/arm/st/g4/stm32g4.dtsi index 2ab13841dc..feec71388a 100644 --- a/dts/arm/st/g4/stm32g4.dtsi +++ b/dts/arm/st/g4/stm32g4.dtsi @@ -390,9 +390,7 @@ interrupt-names = "LINE_0", "LINE_1"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/g4/stm32g473.dtsi b/dts/arm/st/g4/stm32g473.dtsi index 4bfe01b7b3..97565c33e7 100644 --- a/dts/arm/st/g4/stm32g473.dtsi +++ b/dts/arm/st/g4/stm32g473.dtsi @@ -103,9 +103,7 @@ interrupt-names = "LINE_0", "LINE_1"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; bosch,mram-cfg = <0x6a0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/g4/stm32g491.dtsi b/dts/arm/st/g4/stm32g491.dtsi index 5bdac5010d..865d3700d9 100644 --- a/dts/arm/st/g4/stm32g491.dtsi +++ b/dts/arm/st/g4/stm32g491.dtsi @@ -17,10 +17,8 @@ interrupts = <86 0>, <87 0>; interrupt-names = "LINE_0", "LINE_1"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; - sjw = <1>; bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/h5/stm32h5.dtsi b/dts/arm/st/h5/stm32h5.dtsi index f8f9e64e09..d8a93a5861 100644 --- a/dts/arm/st/h5/stm32h5.dtsi +++ b/dts/arm/st/h5/stm32h5.dtsi @@ -442,9 +442,7 @@ interrupt-names = "LINE_0", "LINE_1"; clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/h5/stm32h562.dtsi b/dts/arm/st/h5/stm32h562.dtsi index eeaf65ab7d..66ed8d3d92 100644 --- a/dts/arm/st/h5/stm32h562.dtsi +++ b/dts/arm/st/h5/stm32h562.dtsi @@ -303,9 +303,7 @@ /* common clock FDCAN 1 & 2 */ clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>; bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/h7/stm32h7.dtsi b/dts/arm/st/h7/stm32h7.dtsi index 8c66a67b05..c835040b7e 100644 --- a/dts/arm/st/h7/stm32h7.dtsi +++ b/dts/arm/st/h7/stm32h7.dtsi @@ -475,9 +475,7 @@ interrupts = <19 0>, <21 0>, <63 0>; interrupt-names = "LINE_0", "LINE_1", "CALIB"; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; @@ -490,9 +488,7 @@ interrupts = <20 0>, <22 0>, <63 0>; interrupt-names = "LINE_0", "LINE_1", "CALIB"; bosch,mram-cfg = <0x350 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/h7/stm32h723.dtsi b/dts/arm/st/h7/stm32h723.dtsi index 8c3fa0b1d8..f1b0836f6e 100644 --- a/dts/arm/st/h7/stm32h723.dtsi +++ b/dts/arm/st/h7/stm32h723.dtsi @@ -123,9 +123,7 @@ interrupts = <159 0>, <160 0>, <63 0>; interrupt-names = "LINE_0", "LINE_1", "CALIB"; bosch,mram-cfg = <0x6a0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/arm/st/l4/stm32l431.dtsi b/dts/arm/st/l4/stm32l431.dtsi index d25d3bc1c2..9a9892a0f4 100644 --- a/dts/arm/st/l4/stm32l431.dtsi +++ b/dts/arm/st/l4/stm32l431.dtsi @@ -107,7 +107,6 @@ clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; interrupts = <19 0>, <20 0>, <21 0>, <22 0>; interrupt-names = "TX", "RX0", "RX1", "SCE"; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/arm/st/l4/stm32l432.dtsi b/dts/arm/st/l4/stm32l432.dtsi index 3ad6a2e3aa..9db0a1e244 100644 --- a/dts/arm/st/l4/stm32l432.dtsi +++ b/dts/arm/st/l4/stm32l432.dtsi @@ -57,7 +57,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/l4/stm32l451.dtsi b/dts/arm/st/l4/stm32l451.dtsi index a8722ed589..b566db4336 100644 --- a/dts/arm/st/l4/stm32l451.dtsi +++ b/dts/arm/st/l4/stm32l451.dtsi @@ -141,7 +141,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/l4/stm32l471.dtsi b/dts/arm/st/l4/stm32l471.dtsi index 5a7cd65778..c1f5b5978a 100644 --- a/dts/arm/st/l4/stm32l471.dtsi +++ b/dts/arm/st/l4/stm32l471.dtsi @@ -232,7 +232,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/l4/stm32l496.dtsi b/dts/arm/st/l4/stm32l496.dtsi index d253a94541..12d74f6859 100644 --- a/dts/arm/st/l4/stm32l496.dtsi +++ b/dts/arm/st/l4/stm32l496.dtsi @@ -55,7 +55,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x04000000>; //RCC_APB1ENR1_CAN2EN status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/l4/stm32l4p5.dtsi b/dts/arm/st/l4/stm32l4p5.dtsi index d84f2d164e..03973dcf07 100644 --- a/dts/arm/st/l4/stm32l4p5.dtsi +++ b/dts/arm/st/l4/stm32l4p5.dtsi @@ -291,7 +291,6 @@ interrupt-names = "TX", "RX0", "RX1", "SCE"; clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>; //RCC_APB1ENR1_CAN1EN status = "disabled"; - sjw = <1>; sample-point = <875>; }; diff --git a/dts/arm/st/u5/stm32u5.dtsi b/dts/arm/st/u5/stm32u5.dtsi index 20d4806f92..95bb4173c6 100644 --- a/dts/arm/st/u5/stm32u5.dtsi +++ b/dts/arm/st/u5/stm32u5.dtsi @@ -777,9 +777,7 @@ interrupt-names = "LINE_0", "LINE_1"; clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>; bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>; - sjw = <1>; sample-point = <875>; - sjw-data = <1>; sample-point-data = <875>; status = "disabled"; }; diff --git a/dts/bindings/can/can-controller.yaml b/dts/bindings/can/can-controller.yaml index 0a6309ecd6..a0e31045c7 100644 --- a/dts/bindings/can/can-controller.yaml +++ b/dts/bindings/can/can-controller.yaml @@ -9,26 +9,34 @@ properties: description: bus speed in Baud/s sjw: type: int - required: true - description: Resynchronization jump width (ISO 11898-1) + deprecated: true + 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: type: int deprecated: true description: | - Time quantums of propagation segment (ISO 11898-1). Deprecated in favor of setting advanced - timing parameters from the application. + Initial time quanta of propagation segment (ISO 11898-1). Deprecated in favor of setting + advanced timing parameters from the application. phase-seg1: type: int deprecated: true description: | - Time quantums of phase buffer 1 segment (ISO 11898-1). Deprecated in favor of setting advanced - timing parameters from the application. + Initial time quanta of phase buffer 1 segment (ISO 11898-1). Deprecated in favor of setting + advanced timing parameters from the application. phase-seg2: type: int deprecated: true description: | - Time quantums of phase buffer 2 segment (ISO 11898-1). Deprecated in favor of setting advanced - timing parameters from the application. + Initial time quanta of phase buffer 2 segment (ISO 11898-1). Deprecated in favor of setting + advanced timing parameters from the application. sample-point: type: int description: > diff --git a/dts/bindings/can/can-fd-controller.yaml b/dts/bindings/can/can-fd-controller.yaml index 176013f775..e6842403ac 100644 --- a/dts/bindings/can/can-fd-controller.yaml +++ b/dts/bindings/can/can-fd-controller.yaml @@ -9,26 +9,34 @@ properties: description: data phase bus speed in Baud/s sjw-data: type: int - required: true - description: Resynchronization jump width for the data phase. (ISO11898-1:2015) + deprecated: true + 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: type: int deprecated: true description: | - Time quantums of propagation segment for the data phase (ISO11898-1:2015). Deprecated in favor - of setting advanced timing parameters from the application. + Initial time quanta of propagation segment for the data phase (ISO11898-1:2015). Deprecated in + favor of setting advanced timing parameters from the application. phase-seg1-data: type: int deprecated: true description: | - Time quantums of phase buffer 1 segment for the data phase (ISO11898-1:2015). Deprecated in - favor of setting advanced timing parameters from the application. + Initial time quanta of phase buffer 1 segment for the data phase (ISO11898-1:2015). Deprecated + in favor of setting advanced timing parameters from the application. phase-seg2-data: type: int deprecated: true description: | - Time quantums of phase buffer 2 segment for the data phase (ISO11898-1:2015). Deprecated in - favor of setting advanced timing parameters from the application. + Initial time quanta of phase buffer 2 segment for the data phase (ISO11898-1:2015). Deprecated + in favor of setting advanced timing parameters from the application. sample-point-data: type: int description: > diff --git a/dts/bindings/can/nxp,flexcan-fd.yaml b/dts/bindings/can/nxp,flexcan-fd.yaml index 5661c919c5..890cbd8de9 100644 --- a/dts/bindings/can/nxp,flexcan-fd.yaml +++ b/dts/bindings/can/nxp,flexcan-fd.yaml @@ -15,8 +15,6 @@ description: | interrupt-names = "common"; clocks = <&ccm IMX_CCM_CAN_CLK 0x84 6>; clk-source = <2>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; bus-speed = <125000>; diff --git a/dts/bindings/can/nxp,flexcan.yaml b/dts/bindings/can/nxp,flexcan.yaml index dca50aa8a6..f23d0f45d8 100644 --- a/dts/bindings/can/nxp,flexcan.yaml +++ b/dts/bindings/can/nxp,flexcan.yaml @@ -13,7 +13,6 @@ description: | interrupt-names = "warning", "error", "wake-up", "mb-0-15"; clocks = <&scg KINETIS_SCG_BUS_CLK>; clk-source = <1>; - sjw = <1>; sample-point = <875>; bus-speed = <125000>; pinctrl-0 = <&pinmux_flexcan0>; diff --git a/dts/bindings/can/ti,tcan4x5x.yaml b/dts/bindings/can/ti,tcan4x5x.yaml index 7434da0061..567a158a20 100644 --- a/dts/bindings/can/ti,tcan4x5x.yaml +++ b/dts/bindings/can/ti,tcan4x5x.yaml @@ -16,8 +16,6 @@ description: | reset-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; int-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; bosch,mram-cfg = <0x0 15 15 5 5 0 10 10>; - sjw = <1>; - sjw-data = <1>; sample-point = <875>; sample-point-data = <875>; bus-speed = <125000>; diff --git a/dts/riscv/espressif/esp32c3/esp32c3_common.dtsi b/dts/riscv/espressif/esp32c3/esp32c3_common.dtsi index 19e621e528..3b2bb6d078 100644 --- a/dts/riscv/espressif/esp32c3/esp32c3_common.dtsi +++ b/dts/riscv/espressif/esp32c3/esp32c3_common.dtsi @@ -218,7 +218,6 @@ interrupts = ; interrupt-parent = <&intc>; clocks = <&rtc ESP32_TWAI_MODULE>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/xtensa/espressif/esp32/esp32_common.dtsi b/dts/xtensa/espressif/esp32/esp32_common.dtsi index 09714cd274..c7b735dd77 100644 --- a/dts/xtensa/espressif/esp32/esp32_common.dtsi +++ b/dts/xtensa/espressif/esp32/esp32_common.dtsi @@ -344,7 +344,6 @@ interrupts = ; interrupt-parent = <&intc>; clocks = <&rtc ESP32_TWAI_MODULE>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi index 696e77a8ff..b523ec5336 100644 --- a/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi +++ b/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi @@ -331,7 +331,6 @@ interrupts = ; interrupt-parent = <&intc>; clocks = <&rtc ESP32_TWAI_MODULE>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi index 7655b3537d..3c37327259 100644 --- a/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi +++ b/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi @@ -261,7 +261,6 @@ interrupts = ; interrupt-parent = <&intc>; clocks = <&rtc ESP32_TWAI_MODULE>; - sjw = <1>; sample-point = <875>; status = "disabled"; }; diff --git a/tests/drivers/can/shell/app.overlay b/tests/drivers/can/shell/app.overlay index 60366fc3a5..2e6c8c9979 100644 --- a/tests/drivers/can/shell/app.overlay +++ b/tests/drivers/can/shell/app.overlay @@ -8,11 +8,9 @@ fake_can: fake_can { compatible = "zephyr,fake-can"; status = "okay"; - sjw = <1>; sample-point = <875>; bus-speed = <125000>; sample-point = <875>; - sjw-data = <1>; bus-speed-data = <1000000>; sample-point-data = <750>; }; diff --git a/tests/lib/devicetree/api/app.overlay b/tests/lib/devicetree/api/app.overlay index 2a5f4bd513..585008a883 100644 --- a/tests/lib/devicetree/api/app.overlay +++ b/tests/lib/devicetree/api/app.overlay @@ -483,7 +483,6 @@ test_can0: can@55553333 { compatible = "vnd,can-controller"; reg = < 0x55553333 0x1000 >; - sjw = <1>; sample-point = <875>; bus-speed = <125000>; status = "okay"; @@ -493,7 +492,6 @@ test_can1: can@55554444 { compatible = "vnd,can-controller"; reg = < 0x55554444 0x1000 >; - sjw = <1>; sample-point = <875>; bus-speed = <125000>; status = "okay";