Skip to content

Commit c54e7d1

Browse files
GeorgeCGVmbolivar-nordic
authored andcommitted
drivers: flash: stm32: qspi: remove flag_quad_io_en field
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 <[email protected]>
1 parent a8e0699 commit c54e7d1

File tree

1 file changed

+26
-35
lines changed

1 file changed

+26
-35
lines changed

drivers/flash/flash_stm32_qspi.c

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ struct flash_stm32_qspi_data {
103103
* 24-bit addresses.
104104
*/
105105
bool flag_access_32bit: 1;
106-
/*
107-
* If set IO operations will be perfromed on SIO[0123] pins
108-
*/
109-
bool flag_quad_io_en: 1;
110106
};
111107

112108
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,
141137
{
142138
struct flash_stm32_qspi_data *dev_data = dev->data;
143139

144-
if (dev_data->flag_quad_io_en) {
145-
switch (dev_data->mode) {
146-
case JESD216_MODE_114:
147-
cmd->AddressMode = QSPI_ADDRESS_1_LINE;
148-
break;
149-
case JESD216_MODE_144:
150-
cmd->AddressMode = QSPI_ADDRESS_4_LINES;
151-
break;
152-
default:
153-
return -ENOTSUP;
154-
}
155-
156-
cmd->Instruction = dev_data->qspi_read_cmd;
157-
cmd->DataMode = QSPI_DATA_4_LINES;
158-
cmd->DummyCycles = dev_data->qspi_read_cmd_latency;
140+
switch (dev_data->mode) {
141+
case JESD216_MODE_114:
142+
cmd->AddressMode = QSPI_ADDRESS_1_LINE;
143+
break;
144+
case JESD216_MODE_144:
145+
cmd->AddressMode = QSPI_ADDRESS_4_LINES;
146+
break;
147+
default:
148+
return -ENOTSUP;
159149
}
160150

151+
cmd->Instruction = dev_data->qspi_read_cmd;
152+
cmd->DataMode = QSPI_DATA_4_LINES;
153+
cmd->DummyCycles = dev_data->qspi_read_cmd_latency;
154+
161155
return 0;
162156
}
163157

@@ -166,24 +160,22 @@ static inline int qspi_prepare_quad_program(const struct device *dev,
166160
{
167161
struct flash_stm32_qspi_data *dev_data = dev->data;
168162

169-
if (dev_data->flag_quad_io_en) {
170-
cmd->Instruction = dev_data->qspi_write_cmd;
171-
172-
switch (cmd->Instruction) {
173-
case SPI_NOR_CMD_PP_1_1_4:
174-
cmd->AddressMode = QSPI_ADDRESS_1_LINE;
175-
break;
176-
case SPI_NOR_CMD_PP_1_4_4:
177-
cmd->AddressMode = QSPI_ADDRESS_4_LINES;
178-
break;
179-
default:
180-
return -ENOTSUP;
181-
}
163+
cmd->Instruction = dev_data->qspi_write_cmd;
182164

183-
cmd->DataMode = QSPI_DATA_4_LINES;
184-
cmd->DummyCycles = 0;
165+
switch (cmd->Instruction) {
166+
case SPI_NOR_CMD_PP_1_1_4:
167+
cmd->AddressMode = QSPI_ADDRESS_1_LINE;
168+
break;
169+
case SPI_NOR_CMD_PP_1_4_4:
170+
cmd->AddressMode = QSPI_ADDRESS_4_LINES;
171+
break;
172+
default:
173+
return -ENOTSUP;
185174
}
186175

176+
cmd->DataMode = QSPI_DATA_4_LINES;
177+
cmd->DummyCycles = 0;
178+
187179
return 0;
188180
}
189181

@@ -1047,7 +1039,6 @@ static int spi_nor_process_bfp(const struct device *dev,
10471039
return rc;
10481040
}
10491041

1050-
data->flag_quad_io_en = true;
10511042
LOG_INF("Quad mode enabled");
10521043
}
10531044

0 commit comments

Comments
 (0)