drivers: flash: stm32_qspi: Simplify #ifdef for dual-flash

In multiple places, "#if DT_PROP(DT_NODELABEL(quadspi), dual_flash) &&
defined(QUADSPI_CR_DFM)" was used to guard sections specific to
the dual-flash feature. This is quite long and "#ifdef
STM32_QSPI_DOUBLE_FLASH" is now used instead.

Note the presence of QUADSPI_CR_DFM is no more checked. This is not
considered as an issue since when QUADSPI_CR_DFM is not available, the
QSPI hardware doesn't support dual-flash mode so this mode must not be
enabled in the devicetree. With that change, enabling dual-flash mode
when not available causes a compile-time error.

Signed-off-by: Thomas Altenbach <[email protected]>

Author: taltenbach

drivers/flash/flash_stm32_qspi.c

@@ -395,7 +395,7 @@ static int qspi_read_sfdp(const struct device *dev, off_t addr, void *data,
 
 	LOG_INF("Reading SFDP");
 
-#if DT_PROP(DT_NODELABEL(quadspi), dual_flash) && defined(QUADSPI_CR_DFM)
+#if STM32_QSPI_DOUBLE_FLASH
 	/*
 	 * In dual flash mode, reading the SFDP table would cause the parameters from both flash
 	 * memories to be read (first byte read would be the first SFDP byte from the first flash,
@@ -406,7 +406,7 @@ static int qspi_read_sfdp(const struct device *dev, off_t addr, void *data,
 	 */
 	MODIFY_REG(dev_data->hqspi.Instance->CR, QUADSPI_CR_DFM, QSPI_DUALFLASH_DISABLE);
 	LOG_DBG("Dual flash mode disabled while reading SFDP");
-#endif /* dual_flash */
+#endif /* STM32_QSPI_DOUBLE_FLASH */
 
 	QSPI_CommandTypeDef cmd = {
 		.Instruction = JESD216_CMD_READ_SFDP,
@@ -438,7 +438,7 @@ static int qspi_read_sfdp(const struct device *dev, off_t addr, void *data,
 	dev_data->cmd_status = 0;
 
 end:
-#if DT_PROP(DT_NODELABEL(quadspi), dual_flash) && defined(QUADSPI_CR_DFM)
+#if STM32_QSPI_DOUBLE_FLASH
 	/* Re-enable the dual flash mode */
 	MODIFY_REG(dev_data->hqspi.Instance->CR, QUADSPI_CR_DFM, QSPI_DUALFLASH_ENABLE);
 #endif /* dual_flash */
@@ -1551,7 +1551,7 @@ static int flash_stm32_qspi_init(const struct device *dev)
 	dev_data->hqspi.Init.ClockPrescaler = prescaler;
 	/* Give a bit position from 0 to 31 to the HAL init minus 1 for the DCR1 reg */
 	dev_data->hqspi.Init.FlashSize = find_lsb_set(dev_cfg->flash_size) - 2;
-#if DT_PROP(DT_NODELABEL(quadspi), dual_flash) && defined(QUADSPI_CR_DFM)
+#if STM32_QSPI_DOUBLE_FLASH
 	dev_data->hqspi.Init.SampleShifting = QSPI_SAMPLE_SHIFTING_HALFCYCLE;
 	dev_data->hqspi.Init.ChipSelectHighTime = QSPI_CS_HIGH_TIME_3_CYCLE;
 	dev_data->hqspi.Init.DualFlash = QSPI_DUALFLASH_ENABLE;
@@ -1566,7 +1566,7 @@ static int flash_stm32_qspi_init(const struct device *dev)
 	 * is disabled.
 	 */
 	dev_data->hqspi.Init.FlashID = QSPI_FLASH_ID_1;
-#endif /* dual_flash */
+#endif /* STM32_QSPI_DOUBLE_FLASH */
 
 	HAL_QSPI_Init(&dev_data->hqspi);