i2c: support esp32h2

components/driver/i2c.c

@@ -687,7 +687,7 @@ esp_err_t i2c_param_config(i2c_port_t i2c_num, const i2c_config_t *i2c_conf)
     }
 #if SOC_I2C_SUPPORT_SLAVE
     else {
-    #if CONFIG_IDF_TARGET_ESP32S2
+    #if SOC_I2C_SUPPORT_REF_TICK
         /* On ESP32-S2, APB clock shall always be used in slave mode as the
          * other one, I2C_SCLK_REF_TICK, is too slow, even for sampling a
          * 100KHz SCL. */

components/driver/include/driver/i2c.h

@@ -91,9 +91,10 @@ typedef void *i2c_cmd_handle_t;    /*!< I2C command handle  */
 
 /**
  * @brief Install an I2C driver
+ * @note  Not all Espressif chips can support slave mode (e.g. ESP32C2)
  *
  * @param i2c_num I2C port number
- * @param mode I2C mode (either master or slave). ESP8684 doesn't support i2c slave mode
+ * @param mode I2C mode (either master or slave).
  * @param slv_rx_buf_len Receiving buffer size. Only slave mode will use this value, it is ignored in master mode.
  * @param slv_tx_buf_len Sending buffer size. Only slave mode will use this value, it is ignored in master mode.
  * @param intr_alloc_flags Flags used to allocate the interrupt. One or multiple (ORred) ESP_INTR_FLAG_* values.

components/driver/test/test_i2c.c

@@ -25,6 +25,7 @@
 #include "hal/gpio_hal.h"
 #include "hal/uart_ll.h"
 
+#if SOC_I2C_SUPPORT_SLAVE // i2c test can't work without slave
 
 #define DATA_LENGTH          512  /*!<Data buffer length for test buffer*/
 #define RW_TEST_LENGTH       129  /*!<Data length for r/w test, any value from 0-DATA_LENGTH*/
@@ -723,3 +724,5 @@ TEST_CASE("I2C SCL freq test (local test)", "[i2c][ignore]")
 }
 
 #endif // TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3)
+
+#endif // SOC_I2C_SUPPORT_SLAVE

components/driver/test/test_spi_slave.c

@@ -266,7 +266,7 @@ TEST_CASE("test slave send unaligned","[spi]")
 /********************************************************************************
  *      Test By Master & Slave (2 boards)
  *
- * Master (C3, 8684, H2) && Slave (C3, 8684, H2):
+ * Master (C3, C2, H2) && Slave (C3, C2, H2):
  *      PIN | Master     | Slave      |
  *      ----| ---------  | ---------  |
  *      CS  | 10         | 10         |

components/driver/test/test_spi_slave_hd.c

@@ -605,7 +605,7 @@ TEST_CASE("test spi slave hd segment mode, master too long", "[spi][spi_slv_hd]"
 /********************************************************************************
  *      Test By Master & Slave (2 boards)
  *
- * Master (C3, 8684, H2) && Slave (C3, 8684, H2):
+ * Master (C3, C2, H2) && Slave (C3, C2, H2):
  *      PIN | Master     | Slave      |
  *      ----| ---------  | ---------  |
  *      CS  | 10         | 10         |

components/hal/esp32c2/include/hal/gpspi_flash_ll.h

@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-//NOTE: These macros are changed on 8684 for build. MODIFY these when bringup flash.
+//NOTE: These macros are changed on ESP32-C2 for build. MODIFY these when bringup flash.
 #define gpspi_flash_ll_get_hw(host_id)  ( ((host_id)==SPI2_HOST) ? &GPSPI2 : ({abort();(spi_dev_t*)0;}) )
 #define gpspi_flash_ll_hw_get_id(dev)   ( ((dev) == (void*)&GPSPI2) ? SPI2_HOST : -1 )
 

components/hal/esp32c2/include/hal/i2c_ll.h

@@ -726,7 +726,7 @@ static inline void i2c_ll_set_source_clk(i2c_dev_t *hw, i2c_sclk_t src_clk)
     // rtc_clk needs to switch on.
     if (src_clk == I2C_SCLK_RTC) {
         SET_PERI_REG_MASK(RTC_CNTL_CLK_CONF_REG, RTC_CNTL_DIG_CLK8M_EN_M);
-        esp_rom_delay_us(DELAY_RTC_CLK_SWITCH);
+        esp_rom_delay_us(DELAY_RTC_CLK_SWITCH); // TODO: IDF-4535
     }
     // src_clk : (1) for RTC_CLK, (0) for XTAL
     hw->clk_conf.sclk_sel = (src_clk == I2C_SCLK_RTC) ? 1 : 0;

components/hal/esp32h2/include/hal/i2c_ll.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -87,7 +87,7 @@ typedef struct {
 // I2C slave RX interrupt bitmap
 #define I2C_LL_SLAVE_RX_INT           (I2C_RXFIFO_WM_INT_ENA_M | I2C_TRANS_COMPLETE_INT_ENA_M)
 // I2C source clock
-#define I2C_LL_CLK_SRC_FREQ(src_clk)  (((src_clk) == I2C_SCLK_RTC) ? 20*1000*1000 : 40*1000*1000); // Another clock is XTAL clock
+#define I2C_LL_CLK_SRC_FREQ(src_clk)  (((src_clk) == I2C_SCLK_RTC) ? 8*1000*1000 : 32*1000*1000); // Another clock is XTAL clock
 // delay time after rtc_clk swiching on
 #define DELAY_RTC_CLK_SWITCH          (5)
 // I2C max timeout value

components/hal/esp32h2/rtc_cntl_hal.c

@@ -1,16 +1,8 @@
-// Copyright 2015-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.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The HAL layer for RTC CNTL (common part)
 
@@ -18,6 +10,7 @@
 #include "soc/lldesc.h"
 #include "hal/rtc_hal.h"
 #include "hal/assert.h"
+#include "esp_attr.h"
 
 #define RTC_CNTL_HAL_LINK_BUF_SIZE_MIN  (SOC_RTC_CNTL_CPU_PD_DMA_BLOCK_SIZE) /* The minimum size of dma link buffer */
 
@@ -44,6 +37,7 @@ void * rtc_cntl_hal_dma_link_init(void *elem, void *buff, int size, void *next)
     return (void *)plink;
 }
 
+#if SOC_PM_SUPPORT_CPU_PD
 void rtc_cntl_hal_enable_cpu_retention(void *addr)
 {
     if (addr) {
@@ -59,3 +53,16 @@ void rtc_cntl_hal_enable_cpu_retention(void *addr)
         rtc_cntl_ll_enable_cpu_retention((uint32_t)addr);
     }
 }
+
+void IRAM_ATTR rtc_cntl_hal_disable_cpu_retention(void *addr)
+{
+    rtc_cntl_sleep_retent_t *retent = (rtc_cntl_sleep_retent_t *)addr;
+
+    if (addr) {
+        if (retent->cpu_pd_mem) {
+            rtc_cntl_ll_disable_cpu_retention();
+        }
+    }
+}
+
+#endif // SOC_PM_SUPPORT_CPU_PD

components/hal/spi_flash_hal_iram.c

@@ -19,7 +19,7 @@ void spi_flash_hal_setup_auto_resume_mode(spi_flash_host_inst_t *host);
 
 // HAL for
 //  - MEMSPI
-//  - SPI1~3 on ESP32/S2/S3/C3/H2/8684
+//  - SPI1~3 on ESP32/S2/S3/C3/H2/C2
 // The common part is in spi_flash_hal_common.inc
 
 void spi_flash_hal_erase_chip(spi_flash_host_inst_t *host)

components/soc/esp32c2/include/soc/i2c_struct.h

@@ -887,7 +887,6 @@ typedef struct {
 } i2c_dev_t;
 
 extern i2c_dev_t I2C0;
-extern i2c_dev_t I2C1;
 
 #ifndef __cplusplus
 _Static_assert(sizeof(i2c_dev_t) == 0x184, "Invalid size of i2c_dev_t structure");

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

@@ -47,34 +47,6 @@ config SOC_GPIO_SUPPORT_SLP_SWITCH
     bool
     default y
 
-config SOC_I2C_NUM
-    int
-    default 2
-
-config SOC_I2C_FIFO_LEN
-    int
-    default 32
-
-config SOC_I2C_SUPPORT_SLAVE
-    bool
-    default y
-
-config SOC_I2C_SUPPORT_HW_FSM_RST
-    bool
-    default y
-
-config SOC_I2C_SUPPORT_HW_CLR_BUS
-    bool
-    default y
-
-config SOC_I2C_SUPPORT_XTAL
-    bool
-    default y
-
-config SOC_I2C_SUPPORT_RTC
-    bool
-    default y
-
 config SOC_LEDC_SUPPORT_XTAL_CLOCK
     bool
     default y
@@ -383,6 +355,10 @@ config SOC_I2C_FIFO_LEN
     int
     default 32
 
+config SOC_I2C_SUPPORT_SLAVE
+    bool
+    default y
+
 config SOC_I2C_SUPPORT_HW_FSM_RST
     bool
     default y

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

@@ -128,6 +128,7 @@
 #define SOC_I2C_NUM            (2)
 
 #define SOC_I2C_FIFO_LEN       (32) /*!< I2C hardware FIFO depth */
+#define SOC_I2C_SUPPORT_SLAVE       (1)
 
 //ESP32-S3 support hardware FSM reset
 #define SOC_I2C_SUPPORT_HW_FSM_RST  (1)

docs/en/api-reference/peripherals/i2c.rst

@@ -3,7 +3,7 @@ Inter-Integrated Circuit (I2C)
 
 :link_to_translation:`zh_CN:[中文]`
 
-{IDF_TARGET_I2C_NUM:default="2", esp32c3="1", esp32h2="1", esp328684="1"}
+{IDF_TARGET_I2C_NUM:default="2", esp32c3="1", esp32h2="1", esp32c2="1"}
 
 Overview
 --------
@@ -20,20 +20,29 @@ Driver Features
 I2C driver governs communications of devices over the I2C bus. The driver supports the following features:
 
 - Reading and writing bytes in Master mode
+
+.. only:: SOC_I2C_SUPPORT_SLAVE
+
     - Slave mode
+
 - Reading and writing to registers which are in turn read/written by the master
 
 
 Driver Usage
 ------------
 
+{IDF_TARGET_I2C_ROLE:default="master or slave", esp32c2="master"}
+
 The following sections describe typical steps of configuring and operating the I2C driver:
 
-1. :ref:`i2c-api-configure-driver` - set the initialization parameters (master or slave mode, GPIO pins for SDA and SCL, clock speed, etc.)
-2. :ref:`i2c-api-install-driver`- activate the driver on one of the two I2C controllers as a master or slave
-3. Depending on whether you configure the driver for a master or slave, choose the appropriate item
+1. :ref:`i2c-api-configure-driver` - set the initialization parameters ({IDF_TARGET_I2C_ROLE} mode, GPIO pins for SDA and SCL, clock speed, etc.)
+2. :ref:`i2c-api-install-driver`- activate the driver on one of the two I2C controllers as a {IDF_TARGET_I2C_ROLE}
+3. Depending on whether you configure the driver for a {IDF_TARGET_I2C_ROLE}, choose the appropriate item
 
     a) :ref:`i2c-api-master-mode` - handle communications (master)
+
+    .. only:: SOC_I2C_SUPPORT_SLAVE
+
         b) :ref:`i2c-api-slave-mode` - respond to messages from the master (slave)
 
 4. :ref:`i2c-api-interrupt-handling` - configure and service I2C interrupts
@@ -49,13 +58,16 @@ Configuration
 
 To establish I2C communication, start by configuring the driver. This is done by setting the parameters of the structure :cpp:type:`i2c_config_t`:
 
-- Set I2C **mode of operation** - slave or master from :cpp:type:`i2c_mode_t`
+- Set I2C **mode of operation** - {IDF_TARGET_I2C_ROLE} from :cpp:type:`i2c_mode_t`
 - Configure **communication pins**
 
     - Assign GPIO pins for SDA and SCL signals
     - Set whether to enable {IDF_TARGET_NAME}'s internal pull-ups
 
 - (Master only) Set I2C **clock speed**
+
+.. only:: SOC_I2C_SUPPORT_SLAVE
+
     - (Slave only) Configure the following
 
         * Whether to enable **10 bit address mode**
@@ -78,6 +90,8 @@ Configuration example (master):
         // .clk_flags = 0,          /*!< Optional, you can use I2C_SCLK_SRC_FLAG_* flags to choose i2c source clock here. */
     };
 
+.. only:: SOC_I2C_SUPPORT_SLAVE
+
     Configuration example (slave):
 
     .. code-block:: c
@@ -200,8 +214,12 @@ Install Driver
 After the I2C driver is configured, install it by calling the function :cpp:func:`i2c_driver_install` with the following parameters:
 
 - Port number, one of the two port numbers from :cpp:type:`i2c_port_t`
-- Master or slave, selected from :cpp:type:`i2c_mode_t`
+- {IDF_TARGET_I2C_ROLE}, selected from :cpp:type:`i2c_mode_t`
+
+.. only:: SOC_I2C_SUPPORT_SLAVE
+
     - (Slave only) Size of buffers to allocate for sending and receiving data. As I2C is a master-centric bus, data can only go from the slave to the master at the master's request. Therefore, the slave will usually have a send buffer where the slave application writes data. The data remains in the send buffer to be read by the master at the master's own discretion.
+
 - Flags for allocating the interrupt (see ESP_INTR_FLAG_* values in :component_file:`esp_hw_support/include/esp_intr_alloc.h`)
 
 .. _i2c-api-master-mode:
@@ -278,6 +296,8 @@ Likewise, the command link to read from the slave looks as follows:
     i2c_master_write_byte(cmd, (ESP_SLAVE_ADDR << 1) | I2C_MASTER_READ, ACK_EN);
 
 
+.. only:: SOC_I2C_SUPPORT_SLAVE
+
     .. _i2c-api-slave-mode:
 
     Communication as Slave
@@ -297,6 +317,9 @@ The API provides the following functions for slaves
 
     A code example showing how to use these functions can be found in :example:`peripherals/i2c`.
 
+    .. _i2c-api-interrupt-handling:
+
+.. only:: not SOC_I2C_SUPPORT_SLAVE
 
     .. _i2c-api-interrupt-handling:
 
@@ -369,7 +392,7 @@ Before calling :cpp:func:`i2c_driver_delete` to remove i2c driver, please make s
 Application Example
 -------------------
 
-I2C master and slave example: :example:`peripherals/i2c`.
+I2C examples: :example:`peripherals/i2c`.
 
 
 API Reference

docs/zh_CN/api-reference/peripherals/i2c.rst

@@ -3,7 +3,7 @@ I2C 驱动程序
 
 :link_to_translation:`en:[English]`
 
-{IDF_TARGET_I2C_NUM:default="2", esp32c3="1", esp32h2="1", esp328684="1"}
+{IDF_TARGET_I2C_NUM:default="2", esp32c3="1", esp32h2="1", esp32c2="1"}
 
 概述
 ---------

examples/cxx/experimental/experimental_cpp_component/host_test/fixtures/test_fixtures.hpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  *
@@ -318,6 +318,7 @@ struct I2CMasterFix {
     i2c_port_t port;
 };
 
+#if CONFIG_SOC_I2C_SUPPORT_SLAVE
 struct I2CSlaveFix {
     I2CSlaveFix(CreateAnd flags, i2c_port_t port_arg = 0, size_t buffer_size = 64) : i2c_conf(), port(port_arg)
     {
@@ -344,6 +345,7 @@ struct I2CSlaveFix {
     i2c_config_t i2c_conf;
     i2c_port_t port;
 };
+#endif // CONFIG_SOC_I2C_SUPPORT_SLAVE
 
 struct I2CCmdLinkFix
 {

examples/cxx/experimental/experimental_cpp_component/host_test/i2c/main/i2c_cxx_test.cpp

@@ -376,6 +376,7 @@ TEST_CASE("I2CMaster syncronous transfer (read and write)")
     }
 }
 
+#if SOC_I2C_SUPPORT_SLAVE
 TEST_CASE("I2CSlave parameter configuration fails")
 {
     CMockFixture fix;
@@ -458,3 +459,4 @@ TEST_CASE("I2CSlave read calls driver functions correctly")
         CHECK(read_buffer[i] == WRITE_BUFFER[i]);
     }
 }
+#endif // SOC_I2C_SUPPORT_SLAVE

examples/cxx/experimental/experimental_cpp_component/i2c_cxx.cpp

@@ -155,6 +155,7 @@ vector<uint8_t> I2CMaster::sync_transfer(I2CAddress i2c_addr,
     return composed_transfer.do_transfer(i2c_num, i2c_addr)[0];
 }
 
+#if CONFIG_SOC_I2C_SUPPORT_SLAVE
 I2CSlave::I2CSlave(I2CNumber i2c_number,
         SCL_GPIO scl_gpio,
         SDA_GPIO sda_gpio,
@@ -191,6 +192,7 @@ int I2CSlave::read_raw(uint8_t *buffer, size_t buffer_len, chrono::milliseconds
 {
     return i2c_slave_read_buffer(i2c_num.get_value(), buffer, buffer_len, (TickType_t) timeout.count() / portTICK_PERIOD_MS);
 }
+#endif // CONFIG_SOC_I2C_SUPPORT_SLAVE
 
 I2CWrite::I2CWrite(const vector<uint8_t> &bytes, chrono::milliseconds driver_timeout)
     : I2CTransfer<void>(driver_timeout), bytes(bytes)

examples/cxx/experimental/experimental_cpp_component/include/i2c_cxx.hpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -400,6 +400,7 @@ public:
             size_t read_n_bytes);
 };
 
+#if CONFIG_SOC_I2C_SUPPORT_SLAVE
 /**
  * @brief Responsible for initialization and de-initialization of an I2C slave peripheral.
  */
@@ -451,6 +452,7 @@ public:
      */
     virtual int read_raw(uint8_t* buffer, size_t buffer_len, std::chrono::milliseconds timeout);
 };
+#endif // CONFIG_SOC_I2C_SUPPORT_SLAVE
 
 /**
  * Implementation for simple I2C writes, which can be executed by \c I2CMaster::transfer().

examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp

@@ -54,8 +54,9 @@ struct MasterFixture {
     vector<uint8_t> data;
 };
 
+#if SOC_I2C_SUPPORT_SALVE
 // TODO The I2C driver tests are disabled, so disable them here, too. Probably due to no runners.
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP8684)
 
 static void i2c_slave_read_raw_byte(void)
 {
@@ -258,4 +259,5 @@ TEST_CASE_MULTIPLE_DEVICES("I2CMaster Composed transfer", "[cxx i2c][test_env=UT
         i2c_master_composed_trans, i2c_slave_composed_trans);
 
 #endif  //TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)
+#endif // SOC_I2C_SUPPORT_SALVE
 #endif // __cpp_exceptions

examples/peripherals/i2c/i2c_self_test/README.md

@@ -65,13 +65,13 @@ To run this example, you should have one ESP development board (e.g. ESP32-WROVE
 
 **Note:** It is recommended to add external pull-up resistors for SDA/SCL pins to make the communication more stable, though the driver will enable internal pull-up resistors.
 
-#### Pin Assignment(esp32c3):
+#### Pin Assignment(esp32c3, esp32c2, esp32h2):
 
 **Note:** The following pin assignments are used by default, you can change these in the `menuconfig` .
 
 |                                             | SDA    | SCL    |
-| ------------------------- | ------ | ------ |
-| ESP32-C3 I2C Master(Slave)| GPIO5  | GPIO6  |
+| ------------------------------------------- | ------ | ------ |
+| ESP32-C3/ESP32-C2/ESP32-H2 I2C Master(Slave)| GPIO5  | GPIO6  |
 | BH1750 Sensor                               | SDA    | SCL    |
 
 - master:

examples/peripherals/i2c/i2c_self_test/main/Kconfig.projbuild

@@ -3,7 +3,7 @@ menu "Example Configuration"
     menu "I2C Master"
         config I2C_MASTER_SCL
             int "SCL GPIO Num"
-            default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP8684
+            default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2
             default 2 if  IDF_TARGET_ESP32S3
             default 19 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2
             help
@@ -11,7 +11,7 @@ menu "Example Configuration"
 
         config I2C_MASTER_SDA
             int "SDA GPIO Num"
-            default 5 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP8684
+            default 5 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2
             default 1 if  IDF_TARGET_ESP32S3
             default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2
             help
@@ -20,7 +20,7 @@ menu "Example Configuration"
         config I2C_MASTER_PORT_NUM
             int "Port Number"
             default 1 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-            default 0 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP8684
+            default 0 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2
             help
                 Port number for I2C Master device.
 
@@ -32,7 +32,7 @@ menu "Example Configuration"
     endmenu
 
     menu "I2C Slave"
-        depends on SOC_I2C_SUPPORT_SLAVE
+        depends on SOC_I2C_NUM > 1
         config I2C_SLAVE_SCL
             int "SCL GPIO Num"
             default 5

examples/peripherals/i2c/i2c_self_test/main/i2c_example_main.c

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /* i2c - Example
 
    For other examples please check:
@@ -25,7 +30,7 @@ static const char *TAG = "i2c-example";
 #define RW_TEST_LENGTH 128               /*!< Data length for r/w test, [0,DATA_LENGTH] */
 #define DELAY_TIME_BETWEEN_ITEMS_MS 1000 /*!< delay time between different test items */
 
-#if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684)
+#if SOC_I2C_NUM > 1
     #define I2C_SLAVE_SCL_IO CONFIG_I2C_SLAVE_SCL               /*!< gpio number for i2c slave clock */
     #define I2C_SLAVE_SDA_IO CONFIG_I2C_SLAVE_SDA               /*!< gpio number for i2c slave data */
     #define I2C_SLAVE_NUM I2C_NUMBER(CONFIG_I2C_SLAVE_PORT_NUM) /*!< I2C port number for slave dev */
@@ -52,7 +57,7 @@ static const char *TAG = "i2c-example";
 
 SemaphoreHandle_t print_mux = NULL;
 
-#if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684)
+#if SOC_I2C_NUM > 1
 /**
  * @brief test code to read esp-i2c-slave
  *        We need to fill the buffer of esp slave device, then master can read them out.
@@ -166,7 +171,7 @@ static esp_err_t i2c_master_init(void)
     return i2c_driver_install(i2c_master_port, conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0);
 }
 
-#if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684)
+#if SOC_I2C_NUM > 1
 /**
  * @brief i2c slave initialization
  */
@@ -209,7 +214,7 @@ static void i2c_test_task(void *arg)
 {
     int ret;
     uint32_t task_idx = (uint32_t)arg;
-#if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684)
+#if SOC_I2C_NUM > 1
     int i = 0;
     uint8_t *data = (uint8_t *)malloc(DATA_LENGTH);
     uint8_t *data_wr = (uint8_t *)malloc(DATA_LENGTH);
@@ -236,7 +241,7 @@ static void i2c_test_task(void *arg)
         xSemaphoreGive(print_mux);
         vTaskDelay((DELAY_TIME_BETWEEN_ITEMS_MS * (task_idx + 1)) / portTICK_PERIOD_MS);
         //---------------------------------------------------
-#if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684)
+#if SOC_I2C_NUM > 1
         for (i = 0; i < DATA_LENGTH; i++) {
             data[i] = i;
         }
@@ -301,7 +306,7 @@ static void i2c_test_task(void *arg)
 void app_main(void)
 {
     print_mux = xSemaphoreCreateMutex();
-#if !(CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684)
+#if SOC_I2C_NUM > 1
     ESP_ERROR_CHECK(i2c_slave_init());
 #endif
     ESP_ERROR_CHECK(i2c_master_init());

examples/peripherals/i2c/i2c_simple/main/Kconfig.projbuild

@@ -2,14 +2,14 @@ menu "Example Configuration"
 
     config I2C_MASTER_SCL
         int "SCL GPIO Num"
-        default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP8684
+        default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2
         default 19 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
         help
             GPIO number for I2C Master clock line.
 
     config I2C_MASTER_SDA
         int "SDA GPIO Num"
-        default 5 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP8684
+        default 5 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2
         default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
         help
             GPIO number for I2C Master data line.

examples/peripherals/i2c/i2c_tools/README.md

@@ -30,6 +30,8 @@ To run this example, you should have any ESP32, ESP32-S and ESP32-C based develo
 | ESP32-S2 I2C Master | GPIO18 | GPIO19 | GND  | GND   | 3.3V |
 | ESP32-S3 I2C Master | GPIO1  | GPIO2  | GND  | GND   | 3.3V |
 | ESP32-C3 I2C Master | GPIO5  | GPIO6  | GND  | GND   | 3.3V |
+| ESP32-C2 I2C Master | GPIO5  | GPIO6  | GND  | GND   | 3.3V |
+| ESP32-H2 I2C Master | GPIO5  | GPIO6  | GND  | GND   | 3.3V |
 | Sensor              | SDA    | SCL    | GND  | WAK   | VCC  |
 
 **Note: ** There’s no need to add an external pull-up resistors for SDA/SCL pin, because the driver will enable the internal pull-up resistors itself.

examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /* cmd_i2ctools.c
 
    This example code is in the Public Domain (or CC0 licensed, at your option.)
@@ -26,7 +31,7 @@ static const char *TAG = "cmd_i2ctools";
 #if CONFIG_IDF_TARGET_ESP32S3
 static gpio_num_t i2c_gpio_sda = 1;
 static gpio_num_t i2c_gpio_scl = 2;
-#elif CONFIG_IDF_TARGET_ESP32C3
+#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684
 static gpio_num_t i2c_gpio_sda = 5;
 static gpio_num_t i2c_gpio_scl = 6;
 #else

examples/peripherals/i2c/i2c_tools/sdkconfig.defaults

@@ -14,4 +14,4 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
 CONFIG_FREERTOS_USE_TRACE_FACILITY=y
 CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

tools/ci/check_copyright_ignore.txt

@@ -590,7 +590,6 @@ components/esp_rom/include/esp32/rom/tjpgd.h
 components/esp_rom/include/esp32/rom/uart.h
 components/esp_rom/include/esp32c2/rom/md5_hash.h
 components/esp_rom/include/esp32c3/rom/aes.h
-components/esp_rom/include/esp32c3/rom/apb_backup_dma.h
 components/esp_rom/include/esp32c3/rom/bigint.h
 components/esp_rom/include/esp32c3/rom/cache.h
 components/esp_rom/include/esp32c3/rom/crc.h
@@ -912,7 +911,6 @@ components/hal/esp32h2/include/hal/twai_ll.h
 components/hal/esp32h2/include/hal/uhci_ll.h
 components/hal/esp32h2/include/hal/uhci_types.h
 components/hal/esp32h2/include/hal/usb_serial_jtag_ll.h
-components/hal/esp32h2/rtc_cntl_hal.c
 components/hal/esp32s2/brownout_hal.c
 components/hal/esp32s2/cp_dma_hal.c
 components/hal/esp32s2/include/hal/adc_hal_conf.h
@@ -2333,10 +2331,8 @@ examples/peripherals/gpio/generic_gpio/main/gpio_example_main.c
 examples/peripherals/gpio/matrix_keyboard/components/matrix_keyboard/include/matrix_keyboard.h
 examples/peripherals/gpio/matrix_keyboard/components/matrix_keyboard/src/matrix_keyboard.c
 examples/peripherals/gpio/matrix_keyboard/main/matrix_keyboard_example_main.c
-examples/peripherals/i2c/i2c_self_test/main/i2c_example_main.c
 examples/peripherals/i2c/i2c_simple/main/i2c_simple_main.c
 examples/peripherals/i2c/i2c_tools/example_test.py
-examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c
 examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.h
 examples/peripherals/i2c/i2c_tools/main/i2ctools_example_main.c
 examples/peripherals/i2s/i2s_adc_dac/main/app_main.c