Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/ALL_BSP_COMPILE.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
"stm32/stm32h750-weact-ministm32h7xx",
"stm32/stm32h750-fk750m1-vbt6",
"stm32/stm32h7s7-st-disco",
"stm32/stm32h7r7-artpi2",
"stm32/stm32mp157a-st-discovery",
"stm32/stm32mp157a-st-ev1",
"stm32/stm32u575-st-nucleo",
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/libraries/HAL_Drivers/drivers/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ if GetDepend(['BSP_USING_WDT']):
src += ['drv_wdt.c']

if GetDepend(['BSP_USING_SDIO']):
if GetDepend('SOC_SERIES_STM32H7') or GetDepend('SOC_SERIES_STM32F7') or GetDepend('SOC_SERIES_STM32L4') or GetDepend('SOC_SERIES_STM32L5'):
if GetDepend('SOC_SERIES_STM32H7RS') or GetDepend('SOC_SERIES_STM32H7') or GetDepend('SOC_SERIES_STM32F7') or GetDepend('SOC_SERIES_STM32L4') or GetDepend('SOC_SERIES_STM32L5'):
src += ['drv_sdmmc.c']
else:
src += ['drv_sdio.c']
Expand Down
12 changes: 10 additions & 2 deletions bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,11 @@ static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
hsd->DTIMER = HW_SDIO_DATATIMEOUT;
hsd->DLEN = data->blks * data->blksize;
hsd->DCTRL = (get_order(data->blksize) << 4) | (data->flags & DATA_DIR_READ ? SDMMC_DCTRL_DTDIR : 0);
hsd->IDMABASE0 = (rt_uint32_t)cache_buf;
#ifndef SOC_SERIES_STM32H7RS
hsd->IDMABASE0 = (rt_uint32_t)cache_buf;
#else
hsd->IDMABASER = (rt_uint32_t)cache_buf;
#endif
hsd->IDMACTRL = SDMMC_IDMA_IDMAEN;
}
/* config cmd reg */
Expand Down Expand Up @@ -648,7 +652,11 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
*/
static rt_uint32_t stm32_sdio_clock_get(void)
{
return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
#ifndef SOC_SERIES_STM32H7RS
return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
#else
return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC12);
#endif
}

void SDMMC1_IRQHandler(void)
Expand Down
Loading