michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: stm32: qspi: move prepare cmd is enable check

Browse source 
Moves IS_ENABLE check from prepare program and read to the caller.

Signed-off-by: Georgij Cernysiov <geo.cgv@gmail.com>
This commit is contained in:
Georgij Cernysiov 2022-05-06 22:52:02 +02:00 • committed by Marti Bolivar
commit 706697168b
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/flash/flash_stm32_qspi.c
View file

@ -141,7 +141,7 @@ static inline int qspi_prepare_quad_read(const struct device *dev,
{ {
struct flash_stm32_qspi_data *dev_data = dev->data; struct flash_stm32_qspi_data *dev_data = dev->data;
if (IS_ENABLED(STM32_QSPI_USE_QUAD_IO) && dev_data->flag_quad_io_en) { if (dev_data->flag_quad_io_en) {
switch (dev_data->mode) { switch (dev_data->mode) {
case JESD216_MODE_114: case JESD216_MODE_114:
cmd->AddressMode = QSPI_ADDRESS_1_LINE; cmd->AddressMode = QSPI_ADDRESS_1_LINE;
@ -166,7 +166,7 @@ static inline int qspi_prepare_quad_program(const struct device *dev,
{ {
struct flash_stm32_qspi_data *dev_data = dev->data; struct flash_stm32_qspi_data *dev_data = dev->data;
if (IS_ENABLED(STM32_QSPI_USE_QUAD_IO) && dev_data->flag_quad_io_en) { if (dev_data->flag_quad_io_en) {
cmd->Instruction = dev_data->qspi_write_cmd; cmd->Instruction = dev_data->qspi_write_cmd;
switch (cmd->Instruction) { switch (cmd->Instruction) {
@ -344,10 +344,13 @@ static int flash_stm32_qspi_read(const struct device *dev, off_t addr,
}; };
qspi_set_address_size(dev, &cmd); qspi_set_address_size(dev, &cmd);
ret = qspi_prepare_quad_read(dev, &cmd); if (IS_ENABLED(STM32_QSPI_USE_QUAD_IO)) {
if (ret < 0) { ret = qspi_prepare_quad_read(dev, &cmd);
return ret; if (ret < 0) {
return ret;
}
} }
qspi_lock_thread(dev); qspi_lock_thread(dev);
ret = qspi_read_access(dev, &cmd, data, size); ret = qspi_read_access(dev, &cmd, data, size);
@ -404,10 +407,13 @@ static int flash_stm32_qspi_write(const struct device *dev, off_t addr,
}; };
qspi_set_address_size(dev, &cmd_pp); qspi_set_address_size(dev, &cmd_pp);
ret = qspi_prepare_quad_program(dev, &cmd_pp); if (IS_ENABLED(STM32_QSPI_USE_QUAD_IO)) {
if (ret < 0) { ret = qspi_prepare_quad_program(dev, &cmd_pp);
return ret; if (ret < 0) {
return ret;
}
} }
qspi_lock_thread(dev); qspi_lock_thread(dev);
while (size > 0) { while (size > 0) {