espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/fun_pointer_opi_v4.4' into 'release/v4.4'

Browse Source 
opi_flash: Add a function pointer for opi required registers(backport v4.4)

See merge request espressif/esp-idf!16359
This commit is contained in:
Michael (XIAO Xufeng)
2021-12-23 09:24:18 +00:00
parent 61149302e5 a9a5894fe9
commit ec380d04b2
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/spi_flash/esp32s3/spi_flash_oct_flash_init.c
View File

@@ -31,7 +31,7 @@ const static char *TAG = "Octal Flash";
// default value is rom_default_spiflash_legacy_flash_func // default value is rom_default_spiflash_legacy_flash_func
extern const spiflash_legacy_funcs_t *rom_spiflash_legacy_funcs; extern const spiflash_legacy_funcs_t *rom_spiflash_legacy_funcs;
extern int SPI_write_enable(void *spi); extern int SPI_write_enable(void *spi);
static uint32_t s_vendor_id; static uint32_t s_chip_id;
static void s_register_rom_function(void) static void s_register_rom_function(void)
@@ -177,6 +177,18 @@ static void s_flash_init_mxic(esp_rom_spiflash_read_mode_t mode)
} }
#endif // #if CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP #endif // #if CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP
static void s_mxic_set_required_regs(uint32_t chip_id)
{
bool is_swap = false;
#if CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_DTR
is_swap = true;
#else
//STR mode does not need to enable ddr_swap registers
#endif
esp_rom_spi_set_dtr_swap_mode(0, is_swap, is_swap);
esp_rom_spi_set_dtr_swap_mode(1, is_swap, is_swap);
}
/*---------------------------------------------------------------------------------------------------- /*----------------------------------------------------------------------------------------------------
General Functions General Functions
@@ -184,12 +196,14 @@ static void s_flash_init_mxic(esp_rom_spiflash_read_mode_t mode)
typedef struct opi_flash_func_t { typedef struct opi_flash_func_t {
esp_err_t (*probe)(uint32_t flash_id, uint8_t *out_vendor_id); //Function pointer for detecting Flash chip vendor esp_err_t (*probe)(uint32_t flash_id, uint8_t *out_vendor_id); //Function pointer for detecting Flash chip vendor
void (*init)(esp_rom_spiflash_read_mode_t mode); //Function pointer for initialising certain Flash chips void (*init)(esp_rom_spiflash_read_mode_t mode); //Function pointer for initialising certain Flash chips
void (*regs_set)(uint32_t flash_id); //Function pointer for setting required registers, decided by certain flash chips.
} opi_flash_func_t; } opi_flash_func_t;
#if CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP #if CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP
static const opi_flash_func_t opi_flash_func_mxic = { static const opi_flash_func_t opi_flash_func_mxic = {
.probe = &s_probe_mxic_chip, .probe = &s_probe_mxic_chip,
.init = &s_flash_init_mxic .init = &s_flash_init_mxic,
.regs_set = &s_mxic_set_required_regs,
}; };
#endif #endif
@@ -200,6 +214,9 @@ static const opi_flash_func_t *registered_chip_funcs[] = {
NULL, NULL,
}; };
//To check which Flash chip is used
static const opi_flash_func_t **s_chip_func = NULL;
esp_err_t esp_opiflash_init(uint32_t chip_id) esp_err_t esp_opiflash_init(uint32_t chip_id)
{ {
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
@@ -212,7 +229,6 @@ esp_err_t esp_opiflash_init(uint32_t chip_id)
mode = ESP_ROM_SPIFLASH_FASTRD_MODE; mode = ESP_ROM_SPIFLASH_FASTRD_MODE;
#endif #endif
//To check which Flash chip is used
const opi_flash_func_t **chip_func = &registered_chip_funcs[0]; const opi_flash_func_t **chip_func = &registered_chip_funcs[0];
uint8_t vendor_id = 0; uint8_t vendor_id = 0;
@@ -220,13 +236,14 @@ esp_err_t esp_opiflash_init(uint32_t chip_id)
ret = (*chip_func)->probe(chip_id, &vendor_id); ret = (*chip_func)->probe(chip_id, &vendor_id);
if (ret == ESP_OK) { if (ret == ESP_OK) {
// Detect this is the supported chip type // Detect this is the supported chip type
s_chip_id = chip_id;
(*chip_func)->init(mode); (*chip_func)->init(mode);
s_vendor_id = vendor_id;
s_register_rom_function(); s_register_rom_function();
break; break;
} }
chip_func++; chip_func++;
} }
s_chip_func = chip_func;
if (ret != ESP_OK) { if (ret != ESP_OK) {
ESP_EARLY_LOGE(TAG, "No detected Flash chip, please check the menuconfig to see if the chip is supported"); ESP_EARLY_LOGE(TAG, "No detected Flash chip, please check the menuconfig to see if the chip is supported");
@@ -241,14 +258,5 @@ esp_err_t esp_opiflash_init(uint32_t chip_id)
*/ */
void esp_opiflash_set_required_regs(void) void esp_opiflash_set_required_regs(void)
{ {
bool is_swap = false; (*s_chip_func)->regs_set(s_chip_id);
#if CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_DTR
if (s_vendor_id == ESP_FLASH_CHIP_MXIC_OCT) {
is_swap = true;
}
#else
//STR mode does not need to enable ddr_swap registers
#endif
esp_rom_spi_set_dtr_swap_mode(0, is_swap, is_swap);
esp_rom_spi_set_dtr_swap_mode(1, is_swap, is_swap);
} }