From c46f2beee705146e469ffbd455a0ef84eab4a683 Mon Sep 17 00:00:00 2001 From: Guillaume Gautier Date: Mon, 14 Oct 2024 15:34:45 +0200 Subject: [PATCH] drivers: flash: stm32: xspi: fix xspi driver for stm32n6 Add some ifdef to fix compilation error on STM32N6 Signed-off-by: Guillaume Gautier --- drivers/flash/flash_stm32_xspi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/flash/flash_stm32_xspi.c b/drivers/flash/flash_stm32_xspi.c index 81d6f21eb64..0cb785c7df5 100644 --- a/drivers/flash/flash_stm32_xspi.c +++ b/drivers/flash/flash_stm32_xspi.c @@ -190,7 +190,9 @@ static XSPI_RegularCmdTypeDef xspi_prepare_cmd(const uint8_t transfer_mode, .DQSMode = (transfer_rate == XSPI_DTR_TRANSFER) ? HAL_XSPI_DQS_ENABLE : HAL_XSPI_DQS_DISABLE, +#ifdef XSPI_CCR_SIOO .SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD, +#endif /* XSPI_CCR_SIOO */ }; switch (transfer_mode) { @@ -773,7 +775,9 @@ static int stm32_xspi_mem_reset(const struct device *dev) .DataLength = HAL_XSPI_DATA_NONE, .DummyCycles = 0U, .DQSMode = HAL_XSPI_DQS_DISABLE, +#ifdef XSPI_CCR_SIOO .SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD, +#endif /* XSPI_CCR_SIOO */ }; /* Reset enable in SPI mode and STR transfer mode */ @@ -1021,7 +1025,9 @@ static int flash_stm32_xspi_erase(const struct device *dev, off_t addr, .DataMode = HAL_XSPI_DATA_NONE, .DummyCycles = 0U, .DQSMode = HAL_XSPI_DQS_DISABLE, +#ifdef XSPI_CCR_SIOO .SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD, +#endif /* XSPI_CCR_SIOO */ }; if (stm32_xspi_mem_ready(dev, @@ -2121,11 +2127,13 @@ static int flash_stm32_xspi_init(const struct device *dev) } else { } +#if defined(XSPI_DCR1_DLYBYP) #if STM32_XSPI_DLYB_BYPASSED dev_data->hxspi.Init.DelayBlockBypass = HAL_XSPI_DELAY_BLOCK_BYPASS; #else dev_data->hxspi.Init.DelayBlockBypass = HAL_XSPI_DELAY_BLOCK_ON; #endif /* STM32_XSPI_DLYB_BYPASSED */ +#endif /* XSPI_DCR1_DLYBYP */ if (HAL_XSPI_Init(&dev_data->hxspi) != HAL_OK) {