Skip to content

Commit 66d2803

Browse files
drivers: can: stm32: fdcan: use proper namespace for Kconfig symbols
Use proper namespace for the STM32 FDCAN Kconfig symbols, renaming CONFIG_CAN_MAX_STD_ID_FILTER to CONFIG_CAN_STM32_FDCAN_MAX_STD_ID_FILTERS and CONFIG_CAN_MAX_EXT_ID_FILTER to CONFIG_CAN_STM32_FDCAN_MAX_EXT_ID_FILTERS. This prevents Kconfig symbol clashes between different CAN controller drivers. Signed-off-by: Henrik Brix Andersen <henrik@brixandersen.dk>
1 parent 5991985 commit 66d2803

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

drivers/can/Kconfig.stm32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ config CAN_STM32_FDCAN
5757

5858
if CAN_STM32_FDCAN
5959

60-
config CAN_MAX_STD_ID_FILTER
60+
config CAN_STM32_FDCAN_MAX_STD_ID_FILTERS
6161
int "Maximum number of standard (11-bit) ID filters"
6262
default 28
6363
range 0 28
6464
help
6565
Defines the maximum number of filters with standard ID (11-bit)
6666
that can be added by the application.
6767

68-
config CAN_MAX_EXT_ID_FILTER
68+
config CAN_STM32_FDCAN_MAX_EXT_ID_FILTERS
6969
int "Maximum number of extended (29-bit) ID filters"
7070
default 8
7171
range 0 8

drivers/can/can_stm32_fdcan.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,10 @@ static int can_stm32fd_write_reg(const struct device *dev, uint16_t reg, uint32_
361361
break;
362362
case CAN_MCAN_GFC:
363363
/* Map fields to RXGFC including STM32 FDCAN LSS and LSE fields */
364-
bits |= FIELD_PREP(CAN_STM32FD_RXGFC_LSS, CONFIG_CAN_MAX_STD_ID_FILTER) |
365-
FIELD_PREP(CAN_STM32FD_RXGFC_LSE, CONFIG_CAN_MAX_EXT_ID_FILTER);
364+
bits |= FIELD_PREP(CAN_STM32FD_RXGFC_LSS,
365+
CONFIG_CAN_STM32_FDCAN_MAX_STD_ID_FILTERS);
366+
bits |= FIELD_PREP(CAN_STM32FD_RXGFC_LSE,
367+
CONFIG_CAN_STM32_FDCAN_MAX_EXT_ID_FILTERS);
366368
bits |= val & (CAN_MCAN_GFC_ANFS | CAN_MCAN_GFC_ANFE |
367369
CAN_MCAN_GFC_RRFS | CAN_MCAN_GFC_RRFE);
368370
break;
@@ -499,8 +501,8 @@ static int can_stm32fd_init(const struct device *dev)
499501
return ret;
500502
}
501503

502-
rxgfc |= FIELD_PREP(CAN_STM32FD_RXGFC_LSS, CONFIG_CAN_MAX_STD_ID_FILTER) |
503-
FIELD_PREP(CAN_STM32FD_RXGFC_LSE, CONFIG_CAN_MAX_EXT_ID_FILTER);
504+
rxgfc |= FIELD_PREP(CAN_STM32FD_RXGFC_LSS, CONFIG_CAN_STM32_FDCAN_MAX_STD_ID_FILTERS) |
505+
FIELD_PREP(CAN_STM32FD_RXGFC_LSE, CONFIG_CAN_STM32_FDCAN_MAX_EXT_ID_FILTERS);
504506

505507
ret = can_mcan_write_reg(dev, CAN_STM32FD_RXGFC, rxgfc);
506508
if (ret != 0) {
@@ -594,8 +596,8 @@ static const struct can_mcan_ops can_stm32fd_ops = {
594596
PINCTRL_DT_INST_DEFINE(inst); \
595597
CAN_MCAN_CALLBACKS_DEFINE(can_stm32fd_cbs_##inst, \
596598
CAN_MCAN_DT_INST_MRAM_TX_BUFFER_ELEMENTS(inst), \
597-
CONFIG_CAN_MAX_STD_ID_FILTER, \
598-
CONFIG_CAN_MAX_EXT_ID_FILTER); \
599+
CONFIG_CAN_STM32_FDCAN_MAX_STD_ID_FILTERS, \
600+
CONFIG_CAN_STM32_FDCAN_MAX_EXT_ID_FILTERS); \
599601
\
600602
static const struct stm32_pclken can_stm32fd_pclken_##inst[] = \
601603
STM32_DT_INST_CLOCKS(inst); \

0 commit comments

Comments
 (0)