zara
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

drivers: can: stm32: bxcan: rename driver to match reference manuals 

Rename the STM32 bxCAN driver DTS compatible, Kconfig symbol, and
implementation file to match the naming used in the ST reference manuals.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
pull/61546/head
Henrik Brix Andersen 2 years ago committed by Carles Cufí
parent
ff722597e8
commit
913e59c5ea
22 changed files with 33 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      drivers/can/CMakeLists.txt
  2. 17
      drivers/can/Kconfig.stm32
  3. 2
      drivers/can/can_stm32_bxcan.c
  4. 2
      dts/arm/st/f0/stm32f042.dtsi
  5. 2
      dts/arm/st/f0/stm32f072.dtsi
  6. 2
      dts/arm/st/f0/stm32f091.dtsi
  7. 2
      dts/arm/st/f1/stm32f103X8.dtsi
  8. 4
      dts/arm/st/f1/stm32f105.dtsi
  9. 2
      dts/arm/st/f3/stm32f3.dtsi
  10. 4
      dts/arm/st/f4/stm32f405.dtsi
  11. 4
      dts/arm/st/f4/stm32f412.dtsi
  12. 2
      dts/arm/st/f4/stm32f413.dtsi
  13. 4
      dts/arm/st/f4/stm32f446.dtsi
  14. 2
      dts/arm/st/f7/stm32f7.dtsi
  15. 2
      dts/arm/st/f7/stm32f745.dtsi
  16. 2
      dts/arm/st/l4/stm32l431.dtsi
  17. 2
      dts/arm/st/l4/stm32l432.dtsi
  18. 2
      dts/arm/st/l4/stm32l451.dtsi
  19. 2
      dts/arm/st/l4/stm32l471.dtsi
  20. 2
      dts/arm/st/l4/stm32l496.dtsi
  21. 2
      dts/arm/st/l4/stm32l4p5.dtsi
  22. 2
      dts/bindings/can/st,stm32-bxcan.yaml

2
drivers/can/CMakeLists.txt
Unescape View File

@ -13,7 +13,7 @@ zephyr_library_sources_ifdef(CONFIG_CAN_MCP2515 can_mcp2515.c) @@ -13,7 +13,7 @@ zephyr_library_sources_ifdef(CONFIG_CAN_MCP2515 can_mcp2515.c)
zephyr_library_sources_ifdef(CONFIG_CAN_MCUX_FLEXCAN can_mcux_flexcan.c)
zephyr_library_sources_ifdef(CONFIG_CAN_SAM can_sam.c)
zephyr_library_sources_ifdef(CONFIG_CAN_SAM0 can_sam0.c)
zephyr_library_sources_ifdef(CONFIG_CAN_STM32 can_stm32.c)
zephyr_library_sources_ifdef(CONFIG_CAN_STM32_BXCAN can_stm32_bxcan.c)
zephyr_library_sources_ifdef(CONFIG_CAN_STM32FD can_stm32fd.c)
zephyr_library_sources_ifdef(CONFIG_CAN_STM32H7 can_stm32h7.c)
zephyr_library_sources_ifdef(CONFIG_CAN_RCAR can_rcar.c)

17
drivers/can/Kconfig.stm32
Unescape View File

@ -3,18 +3,17 @@ @@ -3,18 +3,17 @@
# Copyright (c) 2018 Alexander Wachter
# SPDX-License-Identifier: Apache-2.0
config CAN_STM32
bool "STM32 CAN Driver"
config CAN_STM32_BXCAN
bool "STM32 bxCAN driver"
default y
depends on DT_HAS_ST_STM32_CAN_ENABLED
depends on DT_HAS_ST_STM32_BXCAN_ENABLED
help
Enable STM32 CAN Driver.
Tested on STM32F0, STM32F4, STM32L4 and STM32F7 series.
Enable STM32 bxCAN Driver.
if CAN_STM32
if CAN_STM32_BXCAN
config CAN_MAX_STD_ID_FILTER
int "Maximum number of std ID filters"
int "Maximum number of standard (11-bit) ID filters"
default 14
range 0 28
help
@ -30,7 +29,7 @@ config CAN_MAX_STD_ID_FILTER @@ -30,7 +29,7 @@ config CAN_MAX_STD_ID_FILTER
CAN_MAX_STD_ID_FILTER + CAN_MAX_EXT_ID_FILTER * 2 <= 28
config CAN_MAX_EXT_ID_FILTER
int "Maximum number of ext ID filters"
int "Maximum number of extended (29-bit) ID filters"
default 7
range 0 14
help
@ -45,4 +44,4 @@ config CAN_MAX_EXT_ID_FILTER @@ -45,4 +44,4 @@ config CAN_MAX_EXT_ID_FILTER
CAN_MAX_STD_ID_FILTER + CAN_MAX_EXT_ID_FILTER * 2 <= 28
endif # CAN_STM32
endif # CAN_STM32_BXCAN

2
drivers/can/can_stm32.c → drivers/can/can_stm32_bxcan.c
Unescape View File

@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(can_stm32, CONFIG_CAN_LOG_LEVEL); @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(can_stm32, CONFIG_CAN_LOG_LEVEL);
#define CAN_INIT_TIMEOUT (10 * sys_clock_hw_cycles_per_sec() / MSEC_PER_SEC)
#define DT_DRV_COMPAT st_stm32_can
#define DT_DRV_COMPAT st_stm32_bxcan
#define SP_IS_SET(inst) DT_INST_NODE_HAS_PROP(inst, sample_point) ||

2
dts/arm/st/f0/stm32f042.dtsi
Unescape View File

@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <30 0>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;

2
dts/arm/st/f0/stm32f072.dtsi
Unescape View File

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
compatible = "st,stm32f072", "st,stm32f0", "simple-bus";
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <30 0>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;

2
dts/arm/st/f0/stm32f091.dtsi
Unescape View File

@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <30 0>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;

2
dts/arm/st/f1/stm32f103X8.dtsi
Unescape View File

@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

4
dts/arm/st/f1/stm32f105.dtsi
Unescape View File

@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";
@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
};
can2: can@40006800 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006800 0x400>;
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/f3/stm32f3.dtsi
Unescape View File

@ -414,7 +414,7 @@ @@ -414,7 +414,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

4
dts/arm/st/f4/stm32f405.dtsi
Unescape View File

@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";
@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
};
can2: can@40006800 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006800 0x400>;
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

4
dts/arm/st/f4/stm32f412.dtsi
Unescape View File

@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";
@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
};
can2: can@40006800 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006800 0x400>;
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/f4/stm32f413.dtsi
Unescape View File

@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
};
can3: can@40006c00 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006c00 0x400>;
interrupts = <74 0>, <75 0>, <76 0>, <77 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

4
dts/arm/st/f4/stm32f446.dtsi
Unescape View File

@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";
@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
};
can2: can@40006800 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006800 0x400>;
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/f7/stm32f7.dtsi
Unescape View File

@ -396,7 +396,7 @@ @@ -396,7 +396,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/f7/stm32f745.dtsi
Unescape View File

@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
};
can2: can@40006800 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006800 0x400>;
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/l4/stm32l431.dtsi
Unescape View File

@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x02000000>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;

2
dts/arm/st/l4/stm32l432.dtsi
Unescape View File

@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/l4/stm32l451.dtsi
Unescape View File

@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/l4/stm32l471.dtsi
Unescape View File

@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/l4/stm32l496.dtsi
Unescape View File

@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
};
can2: can@40006800 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006800 0x400>;
interrupts = <86 0>, <87 0>, <88 0>, <89 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/arm/st/l4/stm32l4p5.dtsi
Unescape View File

@ -285,7 +285,7 @@ @@ -285,7 +285,7 @@
};
can1: can@40006400 {
compatible = "st,stm32-can";
compatible = "st,stm32-bxcan";
reg = <0x40006400 0x400>;
interrupts = <19 0>, <20 0>, <21 0>, <22 0>;
interrupt-names = "TX", "RX0", "RX1", "SCE";

2
dts/bindings/can/st,stm32-can.yaml → dts/bindings/can/st,stm32-bxcan.yaml
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
description: STM32 CAN controller
compatible: "st,stm32-can"
compatible: "st,stm32-bxcan"
include: [can-controller.yaml, pinctrl-device.yaml]
Write Preview
Loading…
Cancel
Save