stm32cube: stm32h5: sdio: fix SDIO_Init failure

when skipping card identification sequence.

This commit fixes an issue in the STM32H5 SDIO driver
where HAL_SDIO_Init() fails if the card identification
sequence is skipped.

Signed-off-by: Sara Touqan <[email protected]>

Author: ExaltZephyr

stm32cube/stm32h5xx/README

@@ -61,4 +61,10 @@ Patch List:
     Impacted files:
      drivers/include/Legacy/stm32_hal_legacy.h
 
+   *Fix SDIO initialization failure when skipping card identification sequence
+     Fixes an issue in the STM32H5 SDIO driver where HAL_SDIO_Init() fails if
+     the card identification sequence is skipped.
+     Impacted files:
+      stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c
+
    See release_note.html from STM32Cube

stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c

@@ -314,7 +314,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
 {
   SDIO_InitTypeDef Init;
   uint32_t sdmmc_clk = 0U;
-  uint8_t data;
 
   /* Check the parameters */
   assert_param(hsdio != NULL);
@@ -407,12 +406,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
   Init.ClockDiv            = hsdio->Init.ClockDiv;
   (void)SDMMC_Init(hsdio->Instance, Init);
 
-  data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
-  if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
-  {
-    return HAL_ERROR;
-  }
-
   hsdio->Context = SDIO_CONTEXT_NONE;
   hsdio->State = HAL_SDIO_STATE_READY;
 
@@ -2507,6 +2500,7 @@ HAL_StatusTypeDef HAL_SDIO_RegisterIOFunctionCallback(SDIO_HandleTypeDef *hsdio,
   */
 static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
 {
+  uint8_t data;
   uint32_t errorstate;
   uint32_t timeout = 0U;
   uint16_t sdio_rca = 1U;
@@ -2581,6 +2575,12 @@ static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
     return HAL_ERROR;
   }
 
+  data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
+  if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
+  {
+    return HAL_ERROR;
+  }
+
   return HAL_OK;
 }