Merge branch 'refactor/remove_redundent_suspend_check' into 'master'

refactor(spi_flash): remove redundent flash suspend check

See merge request espressif/esp-idf!37083
This commit is contained in:
C.S.M 2025-02-19 15:16:03 +08:00
commit 738ce191cd

View File

@ -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 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -841,11 +841,6 @@ esp_err_t spi_flash_common_set_io_mode(esp_flash_t *chip, esp_flash_wrsr_func_t
esp_err_t spi_flash_chip_generic_suspend_cmd_conf(esp_flash_t *chip) esp_err_t spi_flash_chip_generic_suspend_cmd_conf(esp_flash_t *chip)
{ {
// chips which support auto-suspend
if (chip->chip_id >> 16 != 0x20 && chip->chip_id >> 16 != 0xa1 && chip->chip_id >> 16 != 0x46) {
ESP_EARLY_LOGE(TAG, "The flash you use doesn't support auto suspend, only \'XMC\' is supported");
return ESP_ERR_NOT_SUPPORTED;
}
spi_flash_sus_cmd_conf sus_conf = { spi_flash_sus_cmd_conf sus_conf = {
.sus_mask = 0x80, .sus_mask = 0x80,
.cmd_rdsr = CMD_RDSR2, .cmd_rdsr = CMD_RDSR2,