diff --git a/components/hal/esp32c3/include/hal/gpspi_flash_ll.h b/components/hal/esp32c3/include/hal/gpspi_flash_ll.h index 66c78989a2..d1911c4a32 100644 --- a/components/hal/esp32c3/include/hal/gpspi_flash_ll.h +++ b/components/hal/esp32c3/include/hal/gpspi_flash_ll.h @@ -148,6 +148,7 @@ static inline void gpspi_flash_ll_set_buffer_data(spi_dev_t *dev, const void *bu */ static inline void gpspi_flash_ll_user_start(spi_dev_t *dev) { + dev->ctrl.hold_pol = 1; dev->cmd.update = 1; while (dev->cmd.update); dev->cmd.usr = 1; diff --git a/components/spi_flash/test/test_esp_flash.c b/components/spi_flash/test/test_esp_flash.c index 645fd63f34..1360ea83bb 100644 --- a/components/spi_flash/test/test_esp_flash.c +++ b/components/spi_flash/test/test_esp_flash.c @@ -141,21 +141,21 @@ typedef void (*flash_test_func_t)(const esp_partition_t *part); #define FLASH_TEST_CASE_3(STR, FUNCT_TO_RUN) #define FLASH_TEST_CASE_3_IGNORE(STR, FUNCT_TO_RUN) -#else +#else //CONFIG_SPIRAM #if !CONFIG_IDF_TARGET_ESP32C3 #define FLASH_TEST_CASE_3(STR, FUNC_TO_RUN) \ TEST_CASE(STR", 3 chips", "[esp_flash_3][test_env=UT_T1_ESP_FLASH]") {flash_test_func(FUNC_TO_RUN, TEST_CONFIG_NUM);} #define FLASH_TEST_CASE_3_IGNORE(STR, FUNC_TO_RUN) \ TEST_CASE(STR", 3 chips", "[esp_flash_3][test_env=UT_T1_ESP_FLASH][ignore]") {flash_test_func(FUNC_TO_RUN, TEST_CONFIG_NUM);} -#else +#else //CONFIG_IDF_TARGET_ESP32C3 #define FLASH_TEST_CASE_3(STR, FUNC_TO_RUN) \ TEST_CASE(STR", 2 chips", "[esp_flash_2][test_env=UT_T1_ESP_FLASH]") {flash_test_func(FUNC_TO_RUN, TEST_CONFIG_NUM);} #define FLASH_TEST_CASE_3_IGNORE(STR, FUNC_TO_RUN) \ TEST_CASE(STR", 2 chips", "[esp_flash_2][test_env=UT_T1_ESP_FLASH][ignore]") {flash_test_func(FUNC_TO_RUN, TEST_CONFIG_NUM);} #endif // !CONFIG_IDF_TARGET_ESP32C3 -#endif +#endif //CONFIG_SPIRAM //currently all the configs are the same with esp_flash_spi_device_config_t, no more information required typedef esp_flash_spi_device_config_t flashtest_config_t; @@ -204,7 +204,6 @@ flashtest_config_t config_list[] = { #elif CONFIG_IDF_TARGET_ESP32S2 flashtest_config_t config_list[] = { FLASHTEST_CONFIG_COMMON, - /* No runners for esp32s2 for these config yet */ { .io_mode = TEST_SPI_READ_MODE, .speed = TEST_SPI_SPEED, @@ -238,7 +237,7 @@ flashtest_config_t config_list[] = { }; #elif CONFIG_IDF_TARGET_ESP32C3 flashtest_config_t config_list[] = { - /* No runners for esp32c3 for these config yet */ + /* No SPI1 CS1 flash on esp32c3 test */ { /* no need to init */ .host_id = -1,