Merge branch 'feature/support_i2c_on_c61' into 'master'

feat(i2c): support i2c on esp32-c61

Closes IDF-9296 and IDF-9297

See merge request espressif/esp-idf!32596

components/esp_driver_i2c/test_apps/i2c_test_apps/README.md

@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |

components/esp_lcd/test_apps/i2c_lcd/README.md

@@ -1,4 +1,4 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 This test app is used to test LCDs with I2C interface.

components/esp_lcd/test_apps/i2c_lcd_legacy/README.md

@@ -1,4 +1,4 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 This test app is used to test LCDs with I2C interface.

components/hal/esp32c5/include/hal/i2c_ll.h

@@ -12,7 +12,6 @@
 #include "soc/soc_caps.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
-#if SOC_I2C_SUPPORTED  // TODO: [ESP32C5] IDF-8694
 #include "soc/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
@@ -1240,5 +1239,3 @@ static inline void i2c_ll_get_scl_timing(i2c_dev_t *hw, int *high_period, int *l
 #ifdef __cplusplus
 }
 #endif
-
-#endif  // SOC_I2C_SUPPORTED

components/hal/test_apps/hal_i2c/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # HAL I2C test
 

components/soc/esp32/i2c_periph.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// 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.
 
 #include "soc/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
@@ -25,7 +17,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     {
         .sda_out_sig = I2CEXT1_SDA_OUT_IDX,
@@ -33,6 +24,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT1_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT1_SCL_IN_IDX,
         .irq = ETS_I2C_EXT1_INTR_SOURCE,
-        .module = PERIPH_I2C1_MODULE,
     },
 };

components/soc/esp32c2/i2c_periph.c

@@ -17,6 +17,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
 };

components/soc/esp32c3/i2c_periph.c

@@ -1,16 +1,8 @@
-// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// 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.
 
 #include "soc/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
@@ -25,6 +17,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
 };

components/soc/esp32c5/i2c_periph.c

@@ -29,7 +29,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .iomux_func = (uint8_t)LP_MUX_FUNC_NOT_USED,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     /* LP_I2C_NUM_0*/
     {
@@ -39,6 +38,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_in_sig = 0,
         .iomux_func = (uint8_t)LP_I2C_MUX_FUNC,
         .irq = ETS_LP_I2C_INTR_SOURCE,
-        .module = PERIPH_LP_I2C0_MODULE,
     },
 };

components/soc/esp32c5/include/soc/clk_tree_defs.h

@@ -329,7 +329,7 @@ typedef enum {
 /**
  * @brief Type of I2C clock source.
  */
-typedef enum {  // TODO: [ESP32C5] IDF-8694, IDF-8696 (inherit from C6)
+typedef enum {
     I2C_CLK_SRC_XTAL = SOC_MOD_CLK_XTAL,                        /*!< Select XTAL as the source clock */
     I2C_CLK_SRC_RC_FAST = SOC_MOD_CLK_RC_FAST,                  /*!< Select RC_FAST as the source clock */
     I2C_CLK_SRC_DEFAULT = SOC_MOD_CLK_XTAL,                     /*!< Select XTAL as the default source clock */

components/soc/esp32c6/i2c_periph.c

@@ -21,7 +21,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     {
         .sda_out_sig = 0,
@@ -30,7 +29,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_in_sig = 0,
         .iomux_func = LP_I2C_MUX_FUNC,
         .irq = ETS_LP_I2C_INTR_SOURCE,
-        .module = PERIPH_LP_I2C0_MODULE,
     },
 };
 

components/soc/esp32c61/i2c_periph.c

@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "soc/i2c_periph.h"
+#include "soc/gpio_sig_map.h"
+
+
+/*
+ Bunch of constants for every I2C peripheral: GPIO signals, irqs, hw addr of registers etc
+*/
+const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
+    /* I2C_NUM_0*/
+    {
+        .sda_out_sig = I2CEXT0_SDA_OUT_IDX,
+        .sda_in_sig = I2CEXT0_SDA_IN_IDX,
+        .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
+        .scl_in_sig = I2CEXT0_SCL_IN_IDX,
+        .irq = ETS_I2C_EXT0_INTR_SOURCE,
+    },
+};

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

@@ -51,6 +51,10 @@ config SOC_RTC_MEM_SUPPORTED
     bool
     default y
 
+config SOC_I2C_SUPPORTED
+    bool
+    default y
+
 config SOC_SYSTIMER_SUPPORTED
     bool
     default y
@@ -263,6 +267,58 @@ config SOC_DEDIC_PERIPH_ALWAYS_ENABLE
     bool
     default y
 
+config SOC_I2C_NUM
+    int
+    default 1
+
+config SOC_HP_I2C_NUM
+    int
+    default 1
+
+config SOC_I2C_FIFO_LEN
+    int
+    default 32
+
+config SOC_I2C_CMD_REG_NUM
+    int
+    default 8
+
+config SOC_I2C_SUPPORT_SLAVE
+    bool
+    default y
+
+config SOC_I2C_SUPPORT_HW_FSM_RST
+    bool
+    default y
+
+config SOC_I2C_SUPPORT_XTAL
+    bool
+    default y
+
+config SOC_I2C_SUPPORT_RTC
+    bool
+    default y
+
+config SOC_I2C_SUPPORT_10BIT_ADDR
+    bool
+    default y
+
+config SOC_I2C_SLAVE_SUPPORT_BROADCAST
+    bool
+    default y
+
+config SOC_I2C_SLAVE_CAN_GET_STRETCH_CAUSE
+    bool
+    default y
+
+config SOC_I2C_SLAVE_SUPPORT_I2CRAM_ACCESS
+    bool
+    default y
+
+config SOC_I2C_SLAVE_SUPPORT_SLAVE_UNMATCH
+    bool
+    default y
+
 config SOC_LEDC_SUPPORT_PLL_DIV_CLOCK
     bool
     default y

components/soc/esp32c61/include/soc/i2c_struct.h

@@ -1040,34 +1040,6 @@ typedef union {
 } i2c_date_reg_t;
 
 
-/** Group: Address register */
-/** Type of txfifo_start_addr register
- *  I2C TXFIFO base address register
- */
-typedef union {
-    struct {
-        /** txfifo_start_addr : HRO; bitpos: [31:0]; default: 0;
-         *  Represents the I2C txfifo first address.
-         */
-        uint32_t txfifo_start_addr:32;
-    };
-    uint32_t val;
-} i2c_txfifo_start_addr_reg_t;
-
-/** Type of rxfifo_start_addr register
- *  I2C RXFIFO base address register
- */
-typedef union {
-    struct {
-        /** rxfifo_start_addr : HRO; bitpos: [31:0]; default: 0;
-         *  Represents the I2C rxfifo first address.
-         */
-        uint32_t rxfifo_start_addr:32;
-    };
-    uint32_t val;
-} i2c_rxfifo_start_addr_reg_t;
-
-
 typedef struct {
     volatile i2c_scl_low_period_reg_t scl_low_period;
     volatile i2c_ctr_reg_t ctr;
@@ -1091,7 +1063,7 @@ typedef struct {
     volatile i2c_scl_stop_setup_reg_t scl_stop_setup;
     volatile i2c_filter_cfg_reg_t filter_cfg;
     volatile i2c_clk_conf_reg_t clk_conf;
-    volatile i2c_comd_reg_t comd[8];
+    volatile i2c_comd_reg_t command[8];
     volatile i2c_scl_st_time_out_reg_t scl_st_time_out;
     volatile i2c_scl_main_st_time_out_reg_t scl_main_st_time_out;
     volatile i2c_scl_sp_conf_reg_t scl_sp_conf;
@@ -1099,15 +1071,14 @@ typedef struct {
     uint32_t reserved_088[28];
     volatile i2c_date_reg_t date;
     uint32_t reserved_0fc;
-    volatile i2c_txfifo_start_addr_reg_t txfifo_start_addr;
+    volatile uint32_t txfifo_mem[32];
-    uint32_t reserved_104[31];
+    volatile uint32_t rxfifo_mem[32];
-    volatile i2c_rxfifo_start_addr_reg_t rxfifo_start_addr;
 } i2c_dev_t;
 
-extern i2c_dev_t I2C;
+extern i2c_dev_t I2C0;
 
 #ifndef __cplusplus
-_Static_assert(sizeof(i2c_dev_t) == 0x184, "Invalid size of i2c_dev_t structure");
+_Static_assert(sizeof(i2c_dev_t) == 0x200, "Invalid size of i2c_dev_t structure");
 #endif
 
 #ifdef __cplusplus

components/soc/esp32c61/include/soc/soc_caps.h

@@ -38,7 +38,7 @@
 //  \#define SOC_I2S_SUPPORTED               1    //TODO: [ESP32C61] IDF-9312, IDF-9313
 //  \#define SOC_GPSPI_SUPPORTED             1    //TODO: [ESP32C61] IDF-9299, IDF-9300, IDF-9301
 //  \#define SOC_LEDC_SUPPORTED              1    //TODO: [ESP32C61] IDF-9291
-//  \#define SOC_I2C_SUPPORTED               1    //TODO: [ESP32C61] IDF-9296, IDF-9297
+#define SOC_I2C_SUPPORTED               1
 #define SOC_SYSTIMER_SUPPORTED          1       //TODO: [ESP32C61] IDF-9307, IDF-9308
 //  \#define SOC_SUPPORT_COEXISTENCE         1
 //  \#define SOC_SHA_SUPPORTED               1    //TODO: [ESP32C61] IDF-9234
@@ -210,29 +210,21 @@
 
 /*-------------------------- I2C CAPS ----------------------------------------*/
 // ESP32-C61 has 1 I2C
-// #define SOC_I2C_NUM                 (1U)
+#define SOC_I2C_NUM                 (1U)
-// #define SOC_HP_I2C_NUM              (1U)
+#define SOC_HP_I2C_NUM              (1U)
 
-// #define SOC_I2C_FIFO_LEN            (32) /*!< I2C hardware FIFO depth */
+#define SOC_I2C_FIFO_LEN            (32) /*!< I2C hardware FIFO depth */
-// #define SOC_I2C_CMD_REG_NUM         (8)  /*!< Number of I2C command registers */
+#define SOC_I2C_CMD_REG_NUM         (8)  /*!< Number of I2C command registers */
-// #define SOC_I2C_SUPPORT_SLAVE       (1)
+#define SOC_I2C_SUPPORT_SLAVE       (1)
 
-// #define SOC_I2C_SUPPORT_HW_FSM_RST  (1)
+#define SOC_I2C_SUPPORT_HW_FSM_RST  (1)
-// #define SOC_I2C_SUPPORT_HW_CLR_BUS  (1)
+#define SOC_I2C_SUPPORT_XTAL        (1)
-
+#define SOC_I2C_SUPPORT_RTC         (1)
-// #define SOC_I2C_SUPPORT_XTAL        (1)
+#define SOC_I2C_SUPPORT_10BIT_ADDR   (1)
-// #define SOC_I2C_SUPPORT_RTC         (1)
+#define SOC_I2C_SLAVE_SUPPORT_BROADCAST    (1)
-// #define SOC_I2C_SUPPORT_10BIT_ADDR   (1)
+#define SOC_I2C_SLAVE_CAN_GET_STRETCH_CAUSE    (1)
-// #define SOC_I2C_SLAVE_SUPPORT_BROADCAST    (1)
+#define SOC_I2C_SLAVE_SUPPORT_I2CRAM_ACCESS   (1)
-// #define SOC_I2C_SLAVE_CAN_GET_STRETCH_CAUSE    (1)
+#define SOC_I2C_SLAVE_SUPPORT_SLAVE_UNMATCH    (1)
-// #define SOC_I2C_SLAVE_SUPPORT_I2CRAM_ACCESS   (1)
-// #define SOC_I2C_SLAVE_SUPPORT_SLAVE_UNMATCH    (1)
-
-/*-------------------------- LP_I2C CAPS -------------------------------------*/
-// ESP32-C61 has 1 LP_I2C
-// #define SOC_LP_I2C_NUM              (1U)
-
-// #define SOC_LP_I2C_FIFO_LEN         (16) /*!< LP_I2C hardware FIFO depth */
 
 // /*-------------------------- I2S CAPS ----------------------------------------*/
 // #define SOC_I2S_NUM                 (1U)

components/soc/esp32c61/ld/esp32c61.peripherals.ld

@@ -8,7 +8,7 @@ PROVIDE ( UART0               = 0x60000000 );
 PROVIDE ( UART1               = 0x60001000 );
 PROVIDE ( SPIMEM0             = 0x60002000 );
 PROVIDE ( SPIMEM1             = 0x60003000 );
-PROVIDE ( I2C                 = 0x60004000 );
+PROVIDE ( I2C0                = 0x60004000 );
 PROVIDE ( UART2               = 0x60006000 );
 PROVIDE ( LEDC                = 0x60007000 );
 PROVIDE ( TIMERG0             = 0x60008000 );

components/soc/esp32h2/i2c_periph.c

@@ -19,7 +19,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     {
         .sda_out_sig = I2CEXT1_SDA_OUT_IDX,
@@ -27,7 +26,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT1_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT1_SCL_IN_IDX,
         .irq = ETS_I2C_EXT1_INTR_SOURCE,
-        .module = PERIPH_I2C1_MODULE,
     },
 };
 

components/soc/esp32p4/i2c_periph.c

@@ -18,7 +18,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2C0_SCL_PAD_OUT_IDX,
         .scl_in_sig = I2C0_SCL_PAD_IN_IDX,
         .irq = ETS_I2C0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     {
         .sda_out_sig = I2C1_SDA_PAD_OUT_IDX,
@@ -26,7 +25,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2C1_SCL_PAD_OUT_IDX,
         .scl_in_sig = I2C1_SCL_PAD_IN_IDX,
         .irq = ETS_I2C1_INTR_SOURCE,
-        .module = PERIPH_I2C1_MODULE,
     },
     {
         .sda_out_sig = LP_I2C_SDA_PAD_OUT_IDX,
@@ -34,6 +32,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = LP_I2C_SCL_PAD_OUT_IDX,
         .scl_in_sig = LP_I2C_SCL_PAD_IN_IDX,
         .irq = ETS_LP_I2C_INTR_SOURCE,
-        .module = PERIPH_LP_I2C0_MODULE,
     },
 };

components/soc/esp32s2/i2c_periph.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// 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.
 
 #include "soc/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
@@ -25,7 +17,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     {
         .sda_out_sig = I2CEXT1_SDA_OUT_IDX,
@@ -33,6 +24,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT1_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT1_SCL_IN_IDX,
         .irq = ETS_I2C_EXT1_INTR_SOURCE,
-        .module = PERIPH_I2C1_MODULE,
     },
 };

components/soc/esp32s3/i2c_periph.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// 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.
 
 #include "soc/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
@@ -25,7 +17,6 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT0_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT0_SCL_IN_IDX,
         .irq = ETS_I2C_EXT0_INTR_SOURCE,
-        .module = PERIPH_I2C0_MODULE,
     },
     {
         .sda_out_sig = I2CEXT1_SDA_OUT_IDX,
@@ -33,6 +24,5 @@ const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM] = {
         .scl_out_sig = I2CEXT1_SCL_OUT_IDX,
         .scl_in_sig = I2CEXT1_SCL_IN_IDX,
         .irq = ETS_I2C_EXT1_INTR_SOURCE,
-        .module = PERIPH_I2C1_MODULE,
     },
 };

components/soc/include/soc/i2c_periph.h

@@ -8,16 +8,14 @@
 #include "soc/i2c_reg.h"
 #include "soc/i2c_struct.h"
 #include "soc/soc_caps.h"
-#if SOC_I2C_SUPPORTED  // TODO: [ESP32C5] IDF-8694
+#if SOC_I2C_SUPPORTED
-#include "soc/periph_defs.h"
 #include "soc/regdma.h"
-#endif  // SOC_I2C_SUPPORTED
+#include "soc/interrupts.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if SOC_I2C_SUPPORTED
 typedef struct {
     const uint8_t sda_out_sig;
     const uint8_t sda_in_sig;
@@ -25,7 +23,6 @@ typedef struct {
     const uint8_t scl_in_sig;
     const uint8_t iomux_func;
     const uint8_t irq;
-    const periph_module_t module;
 } i2c_signal_conn_t;
 
 extern const i2c_signal_conn_t i2c_periph_signal[SOC_I2C_NUM];
@@ -38,8 +35,8 @@ typedef struct {
 
 extern const i2c_reg_ctx_link_t i2c_regs_retention[SOC_HP_I2C_NUM];
 #endif
-#endif  // SOC_I2C_SUPPORTED
 
 #ifdef __cplusplus
 }
 #endif
+#endif  // SOC_I2C_SUPPORTED

docs/docs_not_updated/esp32c61.txt

@@ -109,7 +109,6 @@ api-reference/peripherals/spi_flash/index.rst
 api-reference/peripherals/touch_pad.rst
 api-reference/peripherals/lcd/i80_lcd.rst
 api-reference/peripherals/lcd/spi_lcd.rst
-api-reference/peripherals/lcd/i2c_lcd.rst
 api-reference/peripherals/lcd/dsi_lcd.rst
 api-reference/peripherals/lcd/index.rst
 api-reference/peripherals/lcd/rgb_lcd.rst
@@ -117,7 +116,6 @@ api-reference/peripherals/adc_calibration.rst
 api-reference/peripherals/spi_slave_hd.rst
 api-reference/peripherals/parlio.rst
 api-reference/peripherals/ds.rst
-api-reference/peripherals/i2c.rst
 api-reference/peripherals/sd_pullup_requirements.rst
 api-reference/peripherals/spi_master.rst
 api-reference/peripherals/index.rst

examples/peripherals/i2c/i2c_eeprom/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # I2C EEPROM example
 

examples/peripherals/i2c/i2c_tools/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # I2C Tools Example
 

examples/peripherals/lcd/i2c_oled/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # I2C OLED example
 

tools/ci/check_copyright_ignore.txt

@@ -514,7 +514,6 @@ components/sdmmc/sdmmc_io.c
 components/sdmmc/sdmmc_mmc.c
 components/sdmmc/sdmmc_sd.c
 components/soc/esp32/adc_periph.c
-components/soc/esp32/i2c_periph.c
 components/soc/esp32/include/soc/bb_reg.h
 components/soc/esp32/include/soc/boot_mode.h
 components/soc/esp32/include/soc/fe_reg.h
@@ -558,7 +557,6 @@ components/soc/esp32/include/soc/uhci_struct.h
 components/soc/esp32/include/soc/wdev_reg.h
 components/soc/esp32/ledc_periph.c
 components/soc/esp32/spi_periph.c
-components/soc/esp32c3/i2c_periph.c
 components/soc/esp32c3/include/soc/apb_saradc_reg.h
 components/soc/esp32c3/include/soc/assist_debug_reg.h
 components/soc/esp32c3/include/soc/bb_reg.h
@@ -589,7 +587,6 @@ components/soc/esp32c3/include/soc/wdev_reg.h
 components/soc/esp32c3/interrupts.c
 components/soc/esp32c3/ledc_periph.c
 components/soc/esp32s2/adc_periph.c
-components/soc/esp32s2/i2c_periph.c
 components/soc/esp32s2/include/soc/apb_saradc_reg.h
 components/soc/esp32s2/include/soc/assist_debug_reg.h
 components/soc/esp32s2/include/soc/bb_reg.h
@@ -624,7 +621,6 @@ components/soc/esp32s2/include/soc/usb_wrap_reg.h
 components/soc/esp32s2/include/soc/usb_wrap_struct.h
 components/soc/esp32s2/include/soc/wdev_reg.h
 components/soc/esp32s2/ledc_periph.c
-components/soc/esp32s3/i2c_periph.c
 components/soc/esp32s3/include/soc/apb_saradc_reg.h
 components/soc/esp32s3/include/soc/assist_debug_reg.h
 components/soc/esp32s3/include/soc/assist_debug_struct.h