alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

spi_flash: reverted unwilling cs_setup argument

Browse Source 
Partially reverted 08f1bbe0c7.

The host should have this flexibility, which is consistent to the cs_hold argument.

However, the user should know as less as possible about the host.
So the wrapper layer (esp_flash_spi_init.c) should cover this, helping to set cs_setup to 1, to meet the common requirements.
This commit is contained in:
Michael (XIAO Xufeng) 2021-06-04 15:19:45 +08:00 committed by Cao Sen Miao
parent 1596e336a1
commit dc6d6f225e
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/driver/test/test_spi_bus_lock.c
View File

@ -242,7 +242,6 @@ static void test_bus_lock(bool test_flash)
.io_mode = SPI_FLASH_DIO,
.speed = ESP_FLASH_5MHZ,
.input_delay_ns = 0,
.cs_setup = 1,
};
//Clamp the WP and HD pins to VDD to make it work in DIO mode

1
components/spi_flash/include/esp_flash_spi_init.h
View File

@ -34,7 +34,6 @@ typedef struct {
* automatically assigned by the SPI bus lock.
*/
int cs_id;
uint32_t cs_setup; ///< (cycles-1) of prepare phase by spi clock
} esp_flash_spi_device_config_t;
/**

7
components/spi_flash/test/test_esp_flash.c
View File

@ -186,7 +186,6 @@ static const char TAG[] = "test_esp_flash";
/* the pin which is usually used by the PSRAM */ \
.cs_io_num = SPI1_CS_IO, \
.input_delay_ns = 0, \
.cs_setup = 1,\
}
#if CONFIG_IDF_TARGET_ESP32
@ -209,7 +208,6 @@ flashtest_config_t config_list[] = {
.cs_id = 0,
.cs_io_num = VSPI_PIN_NUM_CS,
.input_delay_ns = 0,
.cs_setup = 1,\
},
};
#elif CONFIG_IDF_TARGET_ESP32S2
@ -222,7 +220,6 @@ flashtest_config_t config_list[] = {
.cs_id = 0,
.cs_io_num = FSPI_PIN_NUM_CS,
.input_delay_ns = 0,
.cs_setup = 1,\
},
{
.io_mode = TEST_SPI_READ_MODE,
@ -232,7 +229,6 @@ flashtest_config_t config_list[] = {
// uses GPIO matrix on esp32s2 regardless of FORCE_GPIO_MATRIX
.cs_io_num = HSPI_PIN_NUM_CS,
.input_delay_ns = 0,
.cs_setup = 1,\
},
};
#elif CONFIG_IDF_TARGET_ESP32S3
@ -246,7 +242,6 @@ flashtest_config_t config_list[] = {
.cs_id = 0,
.cs_io_num = FSPI_PIN_NUM_CS,
.input_delay_ns = 0,
.cs_setup = 1,\
},
};
#elif CONFIG_IDF_TARGET_ESP32C3
@ -263,7 +258,6 @@ flashtest_config_t config_list[] = {
.cs_id = 0,
.cs_io_num = FSPI_PIN_NUM_CS,
.input_delay_ns = 0,
.cs_setup = 1,\
},
};
#endif
@ -400,7 +394,6 @@ static void setup_new_chip(const flashtest_config_t* test_cfg, esp_flash_t** out
.cs_id = test_cfg->cs_id,
.cs_io_num = test_cfg->cs_io_num,
.input_delay_ns = test_cfg->input_delay_ns,
.cs_setup = test_cfg->cs_setup,
};
esp_flash_t* init_chip;
esp_err_t err = spi_bus_add_flash_device(&init_chip, &dev_cfg);

1
examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
View File

@ -104,7 +104,6 @@ static esp_flash_t* example_init_ext_flash(void)
.cs_io_num = VSPI_IOMUX_PIN_NUM_CS,
.io_mode = SPI_FLASH_DIO,
.speed = ESP_FLASH_40MHZ,
.cs_setup = 1,
};
ESP_LOGI(TAG, "Initializing external SPI Flash");