Merge tag 'v2021.01-rc5' into next

[platform/kernel/u-boot.git] / drivers / mmc / stm32_sdmmc2.c

diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 6d50356..3246f6b 100644 (file)
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
- * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
+ * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
  */
 
 #include <common.h>
@@ -644,7 +644,7 @@ static const struct dm_mmc_ops stm32_sdmmc2_ops = {
 static int stm32_sdmmc2_probe(struct udevice *dev)
 {
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
-       struct stm32_sdmmc2_plat *plat = dev_get_platdata(dev);
+       struct stm32_sdmmc2_plat *plat = dev_get_plat(dev);
        struct stm32_sdmmc2_priv *priv = dev_get_priv(dev);
        struct mmc_config *cfg = &plat->cfg;
        int ret;
@@ -676,27 +676,13 @@ static int stm32_sdmmc2_probe(struct udevice *dev)
                             GPIOD_IS_IN);
 
        cfg->f_min = 400000;
-       cfg->f_max = dev_read_u32_default(dev, "max-frequency", 52000000);
        cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
        cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
        cfg->name = "STM32 SD/MMC";
 
        cfg->host_caps = 0;
-       if (cfg->f_max > 25000000)
-               cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-
-       switch (dev_read_u32_default(dev, "bus-width", 1)) {
-       case 8:
-               cfg->host_caps |= MMC_MODE_8BIT;
-               /* fall through */
-       case 4:
-               cfg->host_caps |= MMC_MODE_4BIT;
-               break;
-       case 1:
-               break;
-       default:
-               pr_err("invalid \"bus-width\" property, force to 1\n");
-       }
+       cfg->f_max = 52000000;
+       mmc_of_parse(dev, cfg);
 
        upriv->mmc = &plat->mmc;
 
@@ -714,7 +700,7 @@ clk_free:
 
 static int stm32_sdmmc_bind(struct udevice *dev)
 {
-       struct stm32_sdmmc2_plat *plat = dev_get_platdata(dev);
+       struct stm32_sdmmc2_plat *plat = dev_get_plat(dev);
 
        return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }
@@ -731,6 +717,6 @@ U_BOOT_DRIVER(stm32_sdmmc2) = {
        .ops = &stm32_sdmmc2_ops,
        .probe = stm32_sdmmc2_probe,
        .bind = stm32_sdmmc_bind,
-       .priv_auto_alloc_size = sizeof(struct stm32_sdmmc2_priv),
-       .platdata_auto_alloc_size = sizeof(struct stm32_sdmmc2_plat),
+       .priv_auto      = sizeof(struct stm32_sdmmc2_priv),
+       .plat_auto      = sizeof(struct stm32_sdmmc2_plat),
 };