Merge branch 'feature/twai_bringup_esp32c6' into 'master'

TWAI: initial driver bring up on esp32c6 (TWAI0 only)

Closes IDF-5313 and IDF-5940

See merge request espressif/esp-idf!20735

components/soc/esp32s3/CMakeLists.txt

@@ -16,9 +16,10 @@ set(srcs
     "sdio_slave_periph.c"
     "sdmmc_periph.c"
     "spi_periph.c"
+    "temperature_sensor_periph.c"
     "timer_periph.c"
     "touch_sensor_periph.c"
-    "temperature_sensor_periph.c"
+    "twai_periph.c"
     "uart_periph.c"
     "usb_periph.c"
     "usb_otg_periph.c")

components/soc/esp32s3/include/soc/Kconfig.soc_caps.in

@@ -803,6 +803,26 @@ config SOC_TOUCH_PAD_MEASURE_WAIT_MAX
     hex
     default 0xFF
 
+config SOC_TWAI_CONTROLLER_NUM
+    int
+    default 1
+
+config SOC_TWAI_CLK_SUPPORT_APB
+    bool
+    default y
+
+config SOC_TWAI_BRP_MIN
+    int
+    default 2
+
+config SOC_TWAI_BRP_MAX
+    int
+    default 16384
+
+config SOC_TWAI_SUPPORTS_RX_STATUS
+    bool
+    default y
+
 config SOC_UART_NUM
     int
     default 3
@@ -1086,15 +1106,3 @@ config SOC_BLE_SUPPORTED
 config SOC_BLE_MESH_SUPPORTED
     bool
     default y
-
-config SOC_TWAI_BRP_MIN
-    int
-    default 2
-
-config SOC_TWAI_BRP_MAX
-    int
-    default 16384
-
-config SOC_TWAI_SUPPORTS_RX_STATUS
-    bool
-    default y

components/soc/esp32s3/include/soc/clk_tree_defs.h

@@ -294,6 +294,21 @@ typedef enum {
     SDM_CLK_SRC_DEFAULT = SOC_MOD_CLK_APB, /*!< Select APB as the default clock choice */
 } soc_periph_sdm_clk_src_t;
 
+//////////////////////////////////////////////////TWAI/////////////////////////////////////////////////////////////////
+
+/**
+ * @brief Array initializer for all supported clock sources of TWAI
+ */
+#define SOC_TWAI_CLKS {SOC_MOD_CLK_APB}
+
+/**
+ * @brief TWAI clock source
+ */
+typedef enum {
+    TWAI_CLK_SRC_APB = SOC_MOD_CLK_APB,     /*!< Select APB as the source clock */
+    TWAI_CLK_SRC_DEFAULT = SOC_MOD_CLK_APB, /*!< Select APB as the default clock choice */
+} soc_periph_twai_clk_src_t;
+
 #ifdef __cplusplus
 }
 #endif

components/soc/esp32s3/include/soc/soc_caps.h

@@ -324,7 +324,11 @@
 #define SOC_TOUCH_PAD_MEASURE_WAIT_MAX      (0xFF)  /*!<The timer frequency is 8Mhz, the max value is 0xff */
 
 /*-------------------------- TWAI CAPS ---------------------------------------*/
-#include "twai_caps.h"
+#define SOC_TWAI_CONTROLLER_NUM         1UL
+#define SOC_TWAI_CLK_SUPPORT_APB        1
+#define SOC_TWAI_BRP_MIN                2
+#define SOC_TWAI_BRP_MAX                16384
+#define SOC_TWAI_SUPPORTS_RX_STATUS     1
 
 /*-------------------------- UART CAPS ---------------------------------------*/
 // ESP32-S3 has 3 UARTs

components/soc/esp32s3/include/soc/twai_caps.h

@@ -1,28 +0,0 @@
-// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SOC_TWAI_BRP_MIN    2
-#define SOC_TWAI_BRP_MAX    16384
-
-#define SOC_TWAI_SUPPORTS_RX_STATUS     1
-
-#ifdef __cplusplus
-}
-#endif

components/soc/esp32s3/include/soc/twai_struct.h

@@ -1,16 +1,8 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 

components/soc/esp32s3/twai_periph.c

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "soc/twai_periph.h"
+#include "soc/gpio_sig_map.h"
+
+const twai_controller_signal_conn_t twai_controller_periph_signals = {
+    .controllers = {
+        [0] = {
+            .module = PERIPH_TWAI_MODULE,
+            .irq_id = ETS_TWAI_INTR_SOURCE,
+            .tx_sig = TWAI_TX_IDX,
+            .rx_sig = TWAI_RX_IDX,
+            .bus_off_sig = TWAI_BUS_OFF_ON_IDX,
+            .clk_out_sig = TWAI_CLKOUT_IDX,
+            .stand_by_sig = -1,
+        },
+    }
+};