Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 61f8da4..6539880 100644 (file)
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -26,39 +25,51 @@ static const struct dm_mmc_ops uniphier_sd_ops = {
 };
 
 static const struct udevice_id uniphier_sd_match[] = {
-       { .compatible = "socionext,uniphier-sdhc", .data = 0 },
+       { .compatible = "socionext,uniphier-sd-v2.91" },
+       { .compatible = "socionext,uniphier-sd-v3.1" },
+       { .compatible = "socionext,uniphier-sd-v3.1.1" },
        { /* sentinel */ }
 };
 
+static ulong uniphier_sd_clk_get_rate(struct tmio_sd_priv *priv)
+{
+#if CONFIG_IS_ENABLED(CLK)
+       return clk_get_rate(&priv->clk);
+#elif CONFIG_SPL_BUILD
+       return 100000000;
+#else
+       return 0;
+#endif
+}
+
 static int uniphier_sd_probe(struct udevice *dev)
 {
        struct tmio_sd_priv *priv = dev_get_priv(dev);
+
+       priv->clk_get_rate = uniphier_sd_clk_get_rate;
+
 #ifndef CONFIG_SPL_BUILD
-       struct clk clk;
        int ret;
 
-       ret = clk_get_by_index(dev, 0, &clk);
+       ret = clk_get_by_index(dev, 0, &priv->clk);
        if (ret < 0) {
                dev_err(dev, "failed to get host clock\n");
                return ret;
        }
 
        /* set to max rate */
-       priv->mclk = clk_set_rate(&clk, ULONG_MAX);
-       if (IS_ERR_VALUE(priv->mclk)) {
+       ret = clk_set_rate(&priv->clk, ULONG_MAX);
+       if (ret < 0) {
                dev_err(dev, "failed to set rate for host clock\n");
-               clk_free(&clk);
-               return priv->mclk;
+               clk_free(&priv->clk);
+               return ret;
        }
 
-       ret = clk_enable(&clk);
-       clk_free(&clk);
+       ret = clk_enable(&priv->clk);
        if (ret) {
                dev_err(dev, "failed to enable host clock\n");
                return ret;
        }
-#else
-       priv->mclk = 100000000;
 #endif
 
        return tmio_sd_probe(dev, 0);