Skip to content

Commit 4b80bb5

Browse files
kartbendkalowsk
authored andcommitted
drivers: can: renesas: properly clear error flag
Fix misleading comments and ensure "Bus Error" flag is properly cleared (Bus-Off Entry flag was used twice previously). Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
1 parent 6ccd228 commit 4b80bb5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

drivers/can/can_renesas_ra.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -761,10 +761,10 @@ static void can_renesas_ra_set_state_change_callback(const struct device *dev,
761761
/* Disable state change interrupt */
762762
p_ctrl->p_reg->CFDC->CTR &= (uint32_t)~CANFD_CFG_ERR_IRQ;
763763

764-
/* Clear state change interrupt flags */
764+
/* Clear error flags */
765765
p_ctrl->p_reg->CFDC->ERFL &=
766766
~(BIT(R_CANFD_CFDC_ERFL_BOEF_Pos) | BIT(R_CANFD_CFDC_ERFL_EWF_Pos) |
767-
BIT(R_CANFD_CFDC_ERFL_EPF_Pos) | BIT(R_CANFD_CFDC_ERFL_BOEF_Pos));
767+
BIT(R_CANFD_CFDC_ERFL_EPF_Pos) | BIT(R_CANFD_CFDC_ERFL_BEF_Pos));
768768
}
769769

770770
data->common.state_change_cb = callback;
@@ -1051,7 +1051,7 @@ static DEVICE_API(can, can_renesas_ra_driver_api) = {
10511051
irq_enable(VECTOR_NUMBER_CAN_RXF); \
10521052
irq_enable(VECTOR_NUMBER_CAN_GLERR); \
10531053
} \
1054-
\
1054+
\
10551055
static struct can_renesas_ra_global_data can_renesas_ra_global_data##id = { \
10561056
.fsp_canfd_global_cfg = \
10571057
{ \
@@ -1064,7 +1064,7 @@ static DEVICE_API(can, can_renesas_ra_driver_api) = {
10641064
.common_fifo_config = CANFD_CFG_COMMONFIFO, \
10651065
}, \
10661066
}; \
1067-
\
1067+
\
10681068
static const struct can_renesas_ra_global_cfg can_renesas_ra_global_cfg##id = { \
10691069
.op_clk = DEVICE_DT_GET(DT_CLOCKS_CTLR_BY_NAME(id, opclk)), \
10701070
.ram_clk = DEVICE_DT_GET(DT_CLOCKS_CTLR_BY_NAME(id, ramclk)), \
@@ -1082,7 +1082,7 @@ static DEVICE_API(can, can_renesas_ra_driver_api) = {
10821082
.dll_max_freq = DT_PROP_OR(id, dll_max_freq, UINT_MAX), \
10831083
.irq_configure = can_renesas_ra_global_irq_configure##id, \
10841084
}; \
1085-
\
1085+
\
10861086
DEVICE_DT_DEFINE(id, can_renesas_ra_global_init, NULL, &can_renesas_ra_global_data##id, \
10871087
&can_renesas_ra_global_cfg##id, PRE_KERNEL_2, CONFIG_CAN_INIT_PRIORITY, \
10881088
NULL)
@@ -1106,7 +1106,7 @@ DT_FOREACH_STATUS_OKAY(renesas_ra_canfd_global, CAN_RENESAS_RA_GLOBAL_DEFINE)
11061106
EVENT_CAN_TX(DT_INST_PROP(index, channel)); \
11071107
R_ICU->IELSR_b[DT_INST_IRQ_BY_NAME(index, err, irq)].IELS = \
11081108
EVENT_CAN_CHERR(DT_INST_PROP(index, channel)); \
1109-
\
1109+
\
11101110
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rx, irq), \
11111111
DT_INST_IRQ_BY_NAME(index, rx, priority), canfd_common_fifo_rx_isr, \
11121112
NULL, 0); \
@@ -1115,7 +1115,7 @@ DT_FOREACH_STATUS_OKAY(renesas_ra_canfd_global, CAN_RENESAS_RA_GLOBAL_DEFINE)
11151115
0); \
11161116
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, err, irq), \
11171117
DT_INST_IRQ_BY_NAME(index, err, priority), canfd_error_isr, NULL, 0); \
1118-
\
1118+
\
11191119
irq_enable(DT_INST_IRQ_BY_NAME(index, rx, irq)); \
11201120
irq_enable(DT_INST_IRQ_BY_NAME(index, tx, irq)); \
11211121
irq_enable(DT_INST_IRQ_BY_NAME(index, err, irq)); \

drivers/can/can_renesas_rz_canfd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -703,10 +703,10 @@ static void can_renesas_rz_set_state_change_callback(const struct device *dev,
703703
/* Disable state change interrupt */
704704
p_ctrl->p_reg->CFDC->CTR &= (uint32_t)~CANFD_CFG_ERR_IRQ;
705705

706-
/* Clear state change interrupt flags */
706+
/* Clear error flags */
707707
p_ctrl->p_reg->CFDC->ERFL &=
708708
~(BIT(R_CANFD_CFDC_ERFL_BOEF_Pos) | BIT(R_CANFD_CFDC_ERFL_EWF_Pos) |
709-
BIT(R_CANFD_CFDC_ERFL_EPF_Pos) | BIT(R_CANFD_CFDC_ERFL_BOEF_Pos));
709+
BIT(R_CANFD_CFDC_ERFL_EPF_Pos) | BIT(R_CANFD_CFDC_ERFL_BEF_Pos));
710710
}
711711

712712
data->common.state_change_cb = callback;
@@ -948,7 +948,7 @@ DEVICE_DT_DEFINE(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_rz_canfd_global), can_ren
948948
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, ch_err, irq), \
949949
DT_INST_IRQ_BY_NAME(index, ch_err, priority), canfd_error_isr, NULL, \
950950
0); \
951-
\
951+
\
952952
irq_enable(DT_INST_IRQ_BY_NAME(index, ch_rec, irq)); \
953953
irq_enable(DT_INST_IRQ_BY_NAME(index, ch_trx, irq)); \
954954
irq_enable(DT_INST_IRQ_BY_NAME(index, ch_err, irq)); \

0 commit comments

Comments
 (0)