mmc: fsl_esdhc_imx: enlarge mmc timeout

[oweals/u-boot.git] / drivers / mmc / s5p_sdhci.c

diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 1f1d2ed8652ec639459823eff5eb9d45c8d6c7aa..9dd0b865eb867643fe0630bbe4363f1705679d10 100644 (file)
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2012 SAMSUNG Electronics
  * Jaehoon Chung <jh80.chung@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -10,7 +9,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <fdtdec.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/clk.h>
@@ -91,6 +90,7 @@ static int s5p_sdhci_core_init(struct sdhci_host *host)
        host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
                SDHCI_QUIRK_32BIT_DMA_ADDR |
                SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
+       host->max_clk = 52000000;
        host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
        host->ops = &s5p_sdhci_ops;
 
@@ -98,7 +98,7 @@ static int s5p_sdhci_core_init(struct sdhci_host *host)
                host->host_caps |= MMC_MODE_8BIT;
 
 #ifndef CONFIG_BLK
-       return add_sdhci(host, 52000000, 400000);
+       return add_sdhci(host, 0, 400000);
 #else
        return 0;
 #endif
@@ -118,9 +118,6 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
        return s5p_sdhci_core_init(host);
 }
 
-#if CONFIG_IS_ENABLED(OF_CONTROL)
-struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
-
 static int do_sdhci_init(struct sdhci_host *host)
 {
        int dev_id, flag, ret;
@@ -183,61 +180,14 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host)
        }
        host->ioaddr = (void *)base;
 
-       gpio_request_by_name_nodev(blob, node, "pwr-gpios", 0, &host->pwr_gpio,
-                                  GPIOD_IS_OUT);
-       gpio_request_by_name_nodev(blob, node, "cd-gpios", 0, &host->cd_gpio,
-                                  GPIOD_IS_IN);
+       gpio_request_by_name_nodev(offset_to_ofnode(node), "pwr-gpios", 0,
+                                  &host->pwr_gpio, GPIOD_IS_OUT);
+       gpio_request_by_name_nodev(offset_to_ofnode(node), "cd-gpios", 0,
+                                  &host->cd_gpio, GPIOD_IS_IN);
 
        return 0;
 }
 
-static int process_nodes(const void *blob, int node_list[], int count)
-{
-       struct sdhci_host *host;
-       int i, node, ret;
-       int failed = 0;
-
-       debug("%s: count = %d\n", __func__, count);
-
-       /* build sdhci_host[] for each controller */
-       for (i = 0; i < count; i++) {
-               node = node_list[i];
-               if (node <= 0)
-                       continue;
-
-               host = &sdhci_host[i];
-
-               ret = sdhci_get_config(blob, node, host);
-               if (ret) {
-                       printf("%s: failed to decode dev %d (%d)\n",    __func__, i, ret);
-                       failed++;
-                       continue;
-               }
-
-               ret = do_sdhci_init(host);
-               if (ret && ret != -ENODEV) {
-                       printf("%s: failed to initialize dev %d (%d)\n", __func__, i, ret);
-                       failed++;
-               }
-       }
-
-       /* we only consider it an error when all nodes fail */
-       return (failed == count ? -1 : 0);
-}
-
-int exynos_mmc_init(const void *blob)
-{
-       int count;
-       int node_list[SDHCI_MAX_HOSTS];
-
-       count = fdtdec_find_aliases_for_id(blob, "mmc",
-                       COMPAT_SAMSUNG_EXYNOS_MMC, node_list,
-                       SDHCI_MAX_HOSTS);
-
-       return process_nodes(blob, node_list, count);
-}
-#endif
-
 #ifdef CONFIG_DM_MMC
 static int s5p_sdhci_probe(struct udevice *dev)
 {
@@ -246,7 +196,7 @@ static int s5p_sdhci_probe(struct udevice *dev)
        struct sdhci_host *host = dev_get_priv(dev);
        int ret;
 
-       ret = sdhci_get_config(gd->fdt_blob, dev->of_offset, host);
+       ret = sdhci_get_config(gd->fdt_blob, dev_of_offset(dev), host);
        if (ret)
                return ret;
 
@@ -254,7 +204,7 @@ static int s5p_sdhci_probe(struct udevice *dev)
        if (ret)
                return ret;
 
-       ret = sdhci_setup_cfg(&plat->cfg, host, 52000000, 400000);
+       ret = sdhci_setup_cfg(&plat->cfg, host, 0, 400000);
        if (ret)
                return ret;