diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-20 15:09:24 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-20 15:09:24 +0300 |
| commit | 2f7821a9278e710b2e825018303c2942f920a77d (patch) | |
| tree | 8e4d97bcd17960370457134c0770276e5fecc209 /drivers/mmc | |
| parent | a9e90d357bbf539e07c1d971161e027eb335183e (diff) | |
| parent | eae488b77906692627622abc61f5b7160b6eb2a4 (diff) | |
| download | u-boot-2f7821a9278e710b2e825018303c2942f920a77d.tar.xz | |
Merge tag 'u-boot-stm32-20220620' of https://source.denx.de/u-boot/custodians/u-boot-stm into next
- Add STM32MP13 SoCs support with associated board STM32M135F-DK
- Correct livetree support in stm32mp1 boards
- Activate livetree for stm32mp15 DHSOM boards
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/stm32_sdmmc2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 44bfc911af..81b07609a9 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -514,10 +514,12 @@ retry_cmd: */ static void stm32_sdmmc2_reset(struct stm32_sdmmc2_priv *priv) { - /* Reset */ - reset_assert(&priv->reset_ctl); - udelay(2); - reset_deassert(&priv->reset_ctl); + if (reset_valid(&priv->reset_ctl)) { + /* Reset */ + reset_assert(&priv->reset_ctl); + udelay(2); + reset_deassert(&priv->reset_ctl); + } /* init the needed SDMMC register after reset */ writel(priv->pwr_reg_msk, priv->base + SDMMC_POWER); @@ -735,7 +737,7 @@ static int stm32_sdmmc2_probe(struct udevice *dev) ret = reset_get_by_index(dev, 0, &priv->reset_ctl); if (ret) - goto clk_disable; + dev_dbg(dev, "No reset provided\n"); gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); @@ -755,8 +757,6 @@ static int stm32_sdmmc2_probe(struct udevice *dev) stm32_sdmmc2_reset(priv); return 0; -clk_disable: - clk_disable(&priv->clk); clk_free: clk_free(&priv->clk); |