From b9896f5bdb8964c284f0b543b0e981b43088930b Mon Sep 17 00:00:00 2001 From: Sergey Terentiev Date: Tue, 5 Jul 2022 14:22:58 +0300 Subject: [PATCH] sdio fix Signed-off-by: Sergey Terentiev --- Marlin/src/HAL/STM32/sdio.cpp | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/Marlin/src/HAL/STM32/sdio.cpp b/Marlin/src/HAL/STM32/sdio.cpp index e958d8c3bc..558cb4686e 100644 --- a/Marlin/src/HAL/STM32/sdio.cpp +++ b/Marlin/src/HAL/STM32/sdio.cpp @@ -214,8 +214,37 @@ bool SDIO_Init() { #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) if (sd_state == HAL_OK) { - sd_state = HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B); - } + //sd_state = HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B); + //Fix 4b sdio + SDIO_InitTypeDef Init; + uint32_t errorstate; + + /* Send CMD55 APP_CMD with argument as card's RCA.*/ + errorstate = SDMMC_CmdAppCommand(hsd.Instance, (uint32_t)(hsd.SdCard.RelCardAdd << 16U)); + if(errorstate != HAL_SD_ERROR_NONE) + { + return false; + } + + /* Send ACMD6 APP_CMD with argument as 2 for wide bus mode */ + errorstate = SDMMC_CmdBusWidth(hsd.Instance, 2U); + if(errorstate != HAL_SD_ERROR_NONE) + { + return false; + } + + /* Configure the SDIO peripheral */ + Init.ClockEdge = hsd.Init.ClockEdge; + Init.ClockBypass = hsd.Init.ClockBypass; + Init.ClockPowerSave = hsd.Init.ClockPowerSave; + Init.BusWide = SDIO_BUS_WIDE_4B; + Init.HardwareFlowControl = hsd.Init.HardwareFlowControl; + Init.ClockDiv = hsd.Init.ClockDiv; + (void)SDIO_Init(hsd.Instance, Init); + + /* Change State */ + hsd.State = HAL_SD_STATE_READY; + } #endif return (sd_state == HAL_OK) ? true : false;