Merge branch 'fix/twai_fix_clock_sel_and_c5_errata' into 'master'

fix(driver_twai): fixed clock sel and c5 listen only mode errata

Closes IDF-13144 and IDF-13059

See merge request espressif/esp-idf!40057
This commit is contained in:
morris
2025-06-30 19:42:52 +08:00
17 changed files with 210 additions and 192 deletions
+28 -30
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -8,35 +8,33 @@
#include "soc/twai_reg.h"
#include "soc/gpio_sig_map.h"
const twai_controller_signal_conn_t twai_controller_periph_signals = {
.controllers = {
[0] = {
.module = PERIPH_TWAI0_MODULE,
.irq_id = ETS_TWAI0_INTR_SOURCE,
.tx_sig = TWAI0_TX_PAD_OUT_IDX,
.rx_sig = TWAI0_RX_PAD_IN_IDX,
.bus_off_sig = TWAI0_BUS_OFF_ON_PAD_OUT_IDX,
.clk_out_sig = TWAI0_CLKOUT_PAD_OUT_IDX,
.stand_by_sig = TWAI0_STANDBY_PAD_OUT_IDX,
},
[1] = {
.module = PERIPH_TWAI1_MODULE,
.irq_id = ETS_TWAI1_INTR_SOURCE,
.tx_sig = TWAI1_TX_PAD_OUT_IDX,
.rx_sig = TWAI1_RX_PAD_IN_IDX,
.bus_off_sig = TWAI1_BUS_OFF_ON_PAD_OUT_IDX,
.clk_out_sig = TWAI1_CLKOUT_PAD_OUT_IDX,
.stand_by_sig = TWAI1_STANDBY_PAD_OUT_IDX,
},
[2] = {
.module = PERIPH_TWAI2_MODULE,
.irq_id = ETS_TWAI2_INTR_SOURCE,
.tx_sig = TWAI2_TX_PAD_OUT_IDX,
.rx_sig = TWAI2_RX_PAD_IN_IDX,
.bus_off_sig = TWAI2_BUS_OFF_ON_PAD_OUT_IDX,
.clk_out_sig = TWAI2_CLKOUT_PAD_OUT_IDX,
.stand_by_sig = TWAI2_STANDBY_PAD_OUT_IDX,
}
const twai_signal_conn_t twai_periph_signals[SOC_TWAI_CONTROLLER_NUM] = {
[0] = {
.module_name = "TWAI0",
.irq_id = ETS_TWAI0_INTR_SOURCE,
.tx_sig = TWAI0_TX_PAD_OUT_IDX,
.rx_sig = TWAI0_RX_PAD_IN_IDX,
.bus_off_sig = TWAI0_BUS_OFF_ON_PAD_OUT_IDX,
.clk_out_sig = TWAI0_CLKOUT_PAD_OUT_IDX,
.stand_by_sig = TWAI0_STANDBY_PAD_OUT_IDX,
},
[1] = {
.module_name = "TWAI1",
.irq_id = ETS_TWAI1_INTR_SOURCE,
.tx_sig = TWAI1_TX_PAD_OUT_IDX,
.rx_sig = TWAI1_RX_PAD_IN_IDX,
.bus_off_sig = TWAI1_BUS_OFF_ON_PAD_OUT_IDX,
.clk_out_sig = TWAI1_CLKOUT_PAD_OUT_IDX,
.stand_by_sig = TWAI1_STANDBY_PAD_OUT_IDX,
},
[2] = {
.module_name = "TWAI2",
.irq_id = ETS_TWAI2_INTR_SOURCE,
.tx_sig = TWAI2_TX_PAD_OUT_IDX,
.rx_sig = TWAI2_RX_PAD_IN_IDX,
.bus_off_sig = TWAI2_BUS_OFF_ON_PAD_OUT_IDX,
.clk_out_sig = TWAI2_CLKOUT_PAD_OUT_IDX,
.stand_by_sig = TWAI2_STANDBY_PAD_OUT_IDX,
}
};