From 9bcf41fa6e2bea3c99f2195e46dfa9166563a1ce Mon Sep 17 00:00:00 2001
From: Meet Patel <meet.patel@espressif.com>
Date: Fri, 12 Sep 2025 14:49:51 +0530
Subject: [PATCH] refactor(lp_core_i2c): Modify lp_core_i2c header to support
 ESP32C5

lp_core_i2c.h header file has sda and scl pins hardcoded to GPIO6 and
GPIO7 which works only for ESP32C6. ESP32C5 uses GPIO2 and GPIO3 for
I2C SDA and SCL. Hence, added LP_I2C_SCL_IO and LP_I2C_SDA_IO macros
under conditional compilation in library header file, so there is no
need to hardcode I2C GPIO pins and any other test apps or examples
that are including the LP I2C header file can also use Macro directly.
---
 components/ulp/lp_core/include/lp_core_i2c.h  | 23 +++++++++++++++----
 .../main/test_lp_core_i2c.c                   | 12 +++++-----
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/components/ulp/lp_core/include/lp_core_i2c.h b/components/ulp/lp_core/include/lp_core_i2c.h
index 90c34d4d8d..93541e2d7d 100644
--- a/components/ulp/lp_core/include/lp_core_i2c.h
+++ b/components/ulp/lp_core/include/lp_core_i2c.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -42,10 +42,23 @@ typedef struct {
     soc_periph_lp_i2c_clk_src_t i2c_src_clk;  /*!< LP I2C source clock type */
 } lp_core_i2c_cfg_t;
 
+#if CONFIG_IDF_TARGET_ESP32P4
+#define LP_I2C_SCL_IO   GPIO_NUM_4
+#define LP_I2C_SDA_IO   GPIO_NUM_5
+#elif CONFIG_IDF_TARGET_ESP32C5
+#define LP_I2C_SCL_IO   GPIO_NUM_3
+#define LP_I2C_SDA_IO   GPIO_NUM_2
+#elif CONFIG_IDF_TARGET_ESP32C6
+#define LP_I2C_SCL_IO   GPIO_NUM_7
+#define LP_I2C_SDA_IO   GPIO_NUM_6
+#else
+#error "Default LP core I2C pin not set for this chip"
+#endif
+
 /* Default LP I2C GPIO settings */
 #define LP_I2C_DEFAULT_GPIO_CONFIG()            \
-        .i2c_pin_cfg.sda_io_num = GPIO_NUM_6,   \
-        .i2c_pin_cfg.scl_io_num = GPIO_NUM_7,   \
+        .i2c_pin_cfg.sda_io_num = LP_I2C_SDA_IO,\
+        .i2c_pin_cfg.scl_io_num = LP_I2C_SCL_IO,\
         .i2c_pin_cfg.sda_pullup_en = true,      \
         .i2c_pin_cfg.scl_pullup_en = true,      \
 
@@ -60,7 +73,7 @@ typedef struct {
 #define LP_I2C_DEFAULT_SRC_CLK()                \
         .i2c_src_clk = LP_I2C_SCLK_LP_FAST,     \
 
-/* Default LP I2C GPIO settings and timing parametes */
+/* Default LP I2C GPIO settings and timing parameters */
 #define LP_CORE_I2C_DEFAULT_CONFIG()            \
     {                                           \
         LP_I2C_DEFAULT_GPIO_CONFIG()            \
@@ -77,7 +90,7 @@ typedef struct {
  * @return esp_err_t    ESP_OK when successful
  *
  * @note The internal pull-up resistors for SDA and SCL pins, if enabled, will
- * provide a weak pull-up value of about 30-50 kOhm. Users are adviced to enable
+ * provide a weak pull-up value of about 30-50 kOhm. Users are advised to enable
  * external pull-ups for better performance at higher SCL frequencies.
  */
 esp_err_t lp_core_i2c_master_init(i2c_port_t lp_i2c_num, const lp_core_i2c_cfg_t *cfg);
diff --git a/components/ulp/test_apps/lp_core/lp_core_basic_tests/main/test_lp_core_i2c.c b/components/ulp/test_apps/lp_core/lp_core_basic_tests/main/test_lp_core_i2c.c
index a34b973dba..2f20d6f0e4 100644
--- a/components/ulp/test_apps/lp_core/lp_core_basic_tests/main/test_lp_core_i2c.c
+++ b/components/ulp/test_apps/lp_core/lp_core_basic_tests/main/test_lp_core_i2c.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -31,11 +31,11 @@ static void load_and_start_lp_core_firmware(ulp_lp_core_cfg_t* cfg, const uint8_
 
 }
 
-#define I2C_SCL_IO     7                        /*!<gpio number for i2c clock, for C6 only GPIO7 is valid  */
-#define I2C_SDA_IO     6                        /*!<gpio number for i2c data, for C6 only GPIO6 is valid */
-#define I2C_SLAVE_NUM I2C_NUM_0                 /*!<I2C port number for slave dev */
-#define I2C_SLAVE_TX_BUF_LEN  (2*DATA_LENGTH)   /*!<I2C slave tx buffer size */
-#define I2C_SLAVE_RX_BUF_LEN  (2*DATA_LENGTH)   /*!<I2C slave rx buffer size */
+#define I2C_SCL_IO           LP_I2C_SCL_IO   /*!<gpio number for i2c clock */
+#define I2C_SDA_IO           LP_I2C_SDA_IO   /*!<gpio number for i2c data */
+#define I2C_SLAVE_NUM        I2C_NUM_0       /*!<I2C port number for slave dev */
+#define I2C_SLAVE_TX_BUF_LEN (2*DATA_LENGTH) /*!<I2C slave tx buffer size */
+#define I2C_SLAVE_RX_BUF_LEN (2*DATA_LENGTH) /*!<I2C slave rx buffer size */
 
 static uint8_t expected_master_write_data[DATA_LENGTH];
 static uint8_t expected_master_read_data[DATA_LENGTH];