michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: stm32: qspi: remove flag_quad_io_en field

Browse source 
There is no need in the `flag_quad_io_en` field.
When QE enabling failed, then the driver `init` fails as well.

There is no way to use qspi in quad mode if qe is not enabled.

Signed-off-by: Georgij Cernysiov <geo.cgv@gmail.com>
This commit is contained in:
Georgij Cernysiov 2022-05-13 10:14:03 +02:00 • committed by Marti Bolivar
commit c54e7d162a
1 changed files with 26 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

61
drivers/flash/flash_stm32_qspi.c
View file

@ -103,10 +103,6 @@ struct flash_stm32_qspi_data {
* 24-bit addresses. * 24-bit addresses.
*/ */
bool flag_access_32bit: 1; bool flag_access_32bit: 1;
/*
* If set IO operations will be perfromed on SIO[0123] pins
*/
bool flag_quad_io_en: 1;
}; };
static inline void qspi_lock_thread(const struct device *dev) static inline void qspi_lock_thread(const struct device *dev)
@ -141,23 +137,21 @@ 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 (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; break;
break; case JESD216_MODE_144:
case JESD216_MODE_144: cmd->AddressMode = QSPI_ADDRESS_4_LINES;
cmd->AddressMode = QSPI_ADDRESS_4_LINES; break;
break; default:
default: return -ENOTSUP;
return -ENOTSUP;
}
cmd->Instruction = dev_data->qspi_read_cmd;
cmd->DataMode = QSPI_DATA_4_LINES;
cmd->DummyCycles = dev_data->qspi_read_cmd_latency;
} }
cmd->Instruction = dev_data->qspi_read_cmd;
cmd->DataMode = QSPI_DATA_4_LINES;
cmd->DummyCycles = dev_data->qspi_read_cmd_latency;
return 0; return 0;
} }
@ -166,24 +160,22 @@ 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 (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) {
case SPI_NOR_CMD_PP_1_1_4: case SPI_NOR_CMD_PP_1_1_4:
cmd->AddressMode = QSPI_ADDRESS_1_LINE; cmd->AddressMode = QSPI_ADDRESS_1_LINE;
break; break;
case SPI_NOR_CMD_PP_1_4_4: case SPI_NOR_CMD_PP_1_4_4:
cmd->AddressMode = QSPI_ADDRESS_4_LINES; cmd->AddressMode = QSPI_ADDRESS_4_LINES;
break; break;
default: default:
return -ENOTSUP; return -ENOTSUP;
}
cmd->DataMode = QSPI_DATA_4_LINES;
cmd->DummyCycles = 0;
} }
cmd->DataMode = QSPI_DATA_4_LINES;
cmd->DummyCycles = 0;
return 0; return 0;
} }
@ -1047,7 +1039,6 @@ static int spi_nor_process_bfp(const struct device *dev,
return rc; return rc;
} }
data->flag_quad_io_en = true;
LOG_INF("Quad mode enabled"); LOG_INF("Quad mode enabled");
} }