diff --git a/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_i2c_flash_text.cpp b/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_i2c_flash_text.cpp
index 570e34e64d..ba18aa7180 100644
--- a/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_i2c_flash_text.cpp
+++ b/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_i2c_flash_text.cpp
@@ -17,7 +17,6 @@
 #include "esp_log.h"
 #include "test_utils.h"
 #include "driver/gptimer.h"
-
 #if SOC_SPI_MEM_SUPPORT_AUTO_SUSPEND
 #include "hal/spimem_flash_ll.h"
 
@@ -61,7 +60,7 @@ static bool IRAM_ATTR gptimer_alarm_suspend_cb(gptimer_handle_t timer, const gpt
 TEST_CASE("Flash suspend support on i2c", "[i2c]")
 {
     // Init context.
-    spi_flash_test_context_t *context = heap_caps_calloc(1, sizeof(spi_flash_test_context_t), MALLOC_CAP_DEFAULT);
+    spi_flash_test_context_t *context = static_cast<spi_flash_test_context_t *>(heap_caps_calloc(1, sizeof(spi_flash_test_context_t), MALLOC_CAP_DEFAULT));
     assert(context != NULL);
 
     context->sem = xSemaphoreCreateBinary();
@@ -92,23 +91,20 @@ TEST_CASE("Flash suspend support on i2c", "[i2c]")
     TEST_ESP_OK(i2c_master_bus_add_device(bus_handle, &dev_cfg, &dev_handle));
 
     gptimer_handle_t gptimer = NULL;
-    gptimer_config_t timer_config = {
-        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-        .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = TIMER_RESOLUTION_HZ,
-    };
+    gptimer_config_t timer_config = {};
+    timer_config.clk_src = GPTIMER_CLK_SRC_DEFAULT;
+    timer_config.direction = GPTIMER_COUNT_UP;
+    timer_config.resolution_hz = TIMER_RESOLUTION_HZ;
     TEST_ESP_OK(gptimer_new_timer(&timer_config, &gptimer));
 
-    gptimer_alarm_config_t alarm_config = {
-        .reload_count = 0,
-        .alarm_count = 1000,
-        .flags = {.auto_reload_on_alarm = true},
-    };
+    gptimer_alarm_config_t alarm_config = {};
+    alarm_config.reload_count = 0;
+    alarm_config.alarm_count = 1000;
+    alarm_config.flags.auto_reload_on_alarm = true;
     TEST_ESP_OK(gptimer_set_alarm_action(gptimer, &alarm_config));
 
-    gptimer_event_callbacks_t cbs = {
-        .on_alarm = gptimer_alarm_suspend_cb,
-    };
+    gptimer_event_callbacks_t cbs = {};
+    cbs.on_alarm = gptimer_alarm_suspend_cb;
 
     TEST_ESP_OK(gptimer_register_event_callbacks(gptimer, &cbs, dev_handle));
     TEST_ESP_OK(gptimer_enable(gptimer));
diff --git a/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_lp_i2c.cpp b/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_lp_i2c.cpp
index 421b25f9c6..18bd89ef9f 100644
--- a/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_lp_i2c.cpp
+++ b/components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_lp_i2c.cpp
@@ -53,7 +53,7 @@ TEST_CASE("LP I2C initialize on i2c slave", "[i2c]")
     i2c_slv_config.i2c_port = LP_I2C_NUM_0;
     i2c_slv_config.sda_io_num = LP_I2C_SDA_IO;
     i2c_slv_config.scl_io_num = LP_I2C_SCL_IO;
-    i2c_slv_config.clk_source = LP_I2C_SCLK_DEFAULT;
+    i2c_slv_config.clk_source = static_cast<i2c_clock_source_t>(LP_I2C_SCLK_DEFAULT);
     i2c_slv_config.send_buf_depth = 256;
     i2c_slv_config.slave_addr = 0x58;
     i2c_slv_config.addr_bit_len = I2C_ADDR_BIT_LEN_7;
@@ -83,7 +83,7 @@ TEST_CASE("LP I2C initialize with wrong IO", "[i2c]")
 TEST_CASE("LP I2C initialize with wrong clock source", "[i2c]")
 {
     i2c_master_bus_config_t i2c_mst_config = {};
-    i2c_mst_config.lp_source_clk = I2C_CLK_SRC_DEFAULT;
+    i2c_mst_config.lp_source_clk = static_cast<lp_i2c_clock_source_t>(I2C_CLK_SRC_DEFAULT);
     i2c_mst_config.i2c_port = LP_I2C_NUM_0;
     i2c_mst_config.scl_io_num = LP_I2C_SCL_IO;
     i2c_mst_config.sda_io_num = LP_I2C_SDA_IO;
diff --git a/components/hal/esp32c2/include/hal/spimem_flash_ll.h b/components/hal/esp32c2/include/hal/spimem_flash_ll.h
index 3a06593bda..ed8eeaa7db 100644
--- a/components/hal/esp32c2/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32c2/include/hal/spimem_flash_ll.h
@@ -411,12 +411,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32c3/include/hal/spimem_flash_ll.h b/components/hal/esp32c3/include/hal/spimem_flash_ll.h
index e412d11413..f6e01cc15d 100644
--- a/components/hal/esp32c3/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32c3/include/hal/spimem_flash_ll.h
@@ -413,12 +413,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32c5/include/hal/spimem_flash_ll.h b/components/hal/esp32c5/include/hal/spimem_flash_ll.h
index 390aa8d7b6..0ebc9e4f96 100644
--- a/components/hal/esp32c5/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32c5/include/hal/spimem_flash_ll.h
@@ -434,12 +434,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32c6/include/hal/spimem_flash_ll.h b/components/hal/esp32c6/include/hal/spimem_flash_ll.h
index b4a7049999..7cbce782e8 100644
--- a/components/hal/esp32c6/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32c6/include/hal/spimem_flash_ll.h
@@ -414,12 +414,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32c61/include/hal/spimem_flash_ll.h b/components/hal/esp32c61/include/hal/spimem_flash_ll.h
index b5cabfaf5f..cfbf6e5ab3 100644
--- a/components/hal/esp32c61/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32c61/include/hal/spimem_flash_ll.h
@@ -427,12 +427,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32h2/include/hal/spimem_flash_ll.h b/components/hal/esp32h2/include/hal/spimem_flash_ll.h
index 63457e0005..6b72528734 100644
--- a/components/hal/esp32h2/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32h2/include/hal/spimem_flash_ll.h
@@ -415,12 +415,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32h21/include/hal/spimem_flash_ll.h b/components/hal/esp32h21/include/hal/spimem_flash_ll.h
index c616afe49d..c44aeff2dc 100644
--- a/components/hal/esp32h21/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32h21/include/hal/spimem_flash_ll.h
@@ -415,12 +415,12 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof (dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof (dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
+
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32h4/include/hal/spimem_flash_ll.h b/components/hal/esp32h4/include/hal/spimem_flash_ll.h
index 6e5ab23312..1dfc762e41 100644
--- a/components/hal/esp32h4/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32h4/include/hal/spimem_flash_ll.h
@@ -413,12 +413,12 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof (dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof (dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
+
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32p4/include/hal/spimem_flash_ll.h b/components/hal/esp32p4/include/hal/spimem_flash_ll.h
index 03267c5b79..bbfdaac655 100644
--- a/components/hal/esp32p4/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32p4/include/hal/spimem_flash_ll.h
@@ -425,12 +425,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32s2/include/hal/spimem_flash_ll.h b/components/hal/esp32s2/include/hal/spimem_flash_ll.h
index b420e023bc..c452a70035 100644
--- a/components/hal/esp32s2/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32s2/include/hal/spimem_flash_ll.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -354,12 +354,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------
diff --git a/components/hal/esp32s3/include/hal/spimem_flash_ll.h b/components/hal/esp32s3/include/hal/spimem_flash_ll.h
index 120d2df2e6..0ba6ca80ae 100644
--- a/components/hal/esp32s3/include/hal/spimem_flash_ll.h
+++ b/components/hal/esp32s3/include/hal/spimem_flash_ll.h
@@ -417,12 +417,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
  */
 static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
 {
-    typeof(dev->user) user = {
-        .usr_mosi = 0,
-        .usr_miso = 1,
-        .usr_addr = 1,
-        .usr_command = 1,
-    };
+    typeof(dev->user) user = {};
+    user.usr_mosi = 0;
+    user.usr_miso = 1;
+    user.usr_addr = 1;
+    user.usr_command = 1;
     dev->user.val = user.val;
 }
 /*------------------------------------------------------------------------------