Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 11:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(st-sdmmc2): check regulator enable/disable return" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2022-01-04 16:36:45 +01:00 • committed by TrustedFirmware Code Review
commit 040b6f99dc
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/st/mmc/stm32_sdmmc2.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2021, STMicroelectronics - All Rights Reserved * Copyright (c) 2018-2022, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -157,13 +157,17 @@ static void stm32_sdmmc2_init(void)
uint32_t clock_div; uint32_t clock_div;
uint32_t freq = STM32MP_MMC_INIT_FREQ; uint32_t freq = STM32MP_MMC_INIT_FREQ;
uintptr_t base = sdmmc2_params.reg_base; uintptr_t base = sdmmc2_params.reg_base;
int ret;
if (sdmmc2_params.max_freq != 0U) { if (sdmmc2_params.max_freq != 0U) {
freq = MIN(sdmmc2_params.max_freq, freq); freq = MIN(sdmmc2_params.max_freq, freq);
} }
if (sdmmc2_params.vmmc_regu != NULL) { if (sdmmc2_params.vmmc_regu != NULL) {
regulator_disable(sdmmc2_params.vmmc_regu); ret = regulator_disable(sdmmc2_params.vmmc_regu);
if (ret < 0) {
panic();
}
} }
mdelay(VCC_POWER_OFF_DELAY); mdelay(VCC_POWER_OFF_DELAY);
@ -173,7 +177,10 @@ static void stm32_sdmmc2_init(void)
mdelay(POWER_CYCLE_DELAY); mdelay(POWER_CYCLE_DELAY);
if (sdmmc2_params.vmmc_regu != NULL) { if (sdmmc2_params.vmmc_regu != NULL) {
regulator_enable(sdmmc2_params.vmmc_regu); ret = regulator_enable(sdmmc2_params.vmmc_regu);
if (ret < 0) {
panic();
}
} }
mdelay(VCC_POWER_ON_DELAY); mdelay(VCC_POWER_ON_DELAY);