Merge tag 'video-fixes-for-2019.04-rc4' of git://git.denx.de/u-boot-video

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

diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 8a9630208c5b5f27b70c884864b8aefad53e7348..739c1629a2711f2aa6b30f0cf5142a9fba994988 100644 (file)
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -1,19 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
+#include <clk.h>
 #include <dm.h>
 #include <dwmmc.h>
 #include <errno.h>
 #include <fdtdec.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
+#include <reset.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -34,6 +35,20 @@ struct dwmci_socfpga_priv_data {
        unsigned int            smplsel;
 };
 
+static void socfpga_dwmci_reset(struct udevice *dev)
+{
+       struct reset_ctl_bulk reset_bulk;
+       int ret;
+
+       ret = reset_get_bulk(dev, &reset_bulk);
+       if (ret) {
+               dev_warn(dev, "Can't get reset: %d\n", ret);
+               return;
+       }
+
+       reset_deassert_bulk(&reset_bulk);
+}
+
 static void socfpga_dwmci_clksel(struct dwmci_host *host)
 {
        struct dwmci_socfpga_priv_data *priv = host->priv;
@@ -56,21 +71,40 @@ static void socfpga_dwmci_clksel(struct dwmci_host *host)
                CLKMGR_PERPLLGRP_EN_SDMMCCLK_MASK);
 }
 
-static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
+static int socfpga_dwmmc_get_clk_rate(struct udevice *dev)
 {
-       /* FIXME: probe from DT eventually too/ */
-       const unsigned long clk = cm_get_mmc_controller_clk_hz();
-
        struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev);
        struct dwmci_host *host = &priv->host;
-       int fifo_depth;
+#if CONFIG_IS_ENABLED(CLK)
+       struct clk clk;
+       int ret;
+
+       ret = clk_get_by_index(dev, 1, &clk);
+       if (ret)
+               return ret;
 
-       if (clk == 0) {
+       host->bus_hz = clk_get_rate(&clk);
+
+       clk_free(&clk);
+#else
+       /* Fixed clock divide by 4 which due to the SDMMC wrapper */
+       host->bus_hz = cm_get_mmc_controller_clk_hz();
+#endif
+       if (host->bus_hz == 0) {
                printf("DWMMC: MMC clock is zero!");
                return -EINVAL;
        }
 
-       fifo_depth = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       return 0;
+}
+
+static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
+{
+       struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev);
+       struct dwmci_host *host = &priv->host;
+       int fifo_depth;
+
+       fifo_depth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                    "fifo-depth", 0);
        if (fifo_depth < 0) {
                printf("DWMMC: Can't get FIFO depth\n");
@@ -78,8 +112,8 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
        }
 
        host->name = dev->name;
-       host->ioaddr = (void *)dev_get_addr(dev);
-       host->buswidth = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       host->ioaddr = (void *)devfdt_get_addr(dev);
+       host->buswidth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                        "bus-width", 4);
        host->clksel = socfpga_dwmci_clksel;
 
@@ -88,13 +122,11 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
         * We only have one dwmmc block on gen5 SoCFPGA.
         */
        host->dev_index = 0;
-       /* Fixed clock divide by 4 which due to the SDMMC wrapper */
-       host->bus_hz = clk;
        host->fifoth_val = MSIZE(0x2) |
                RX_WMARK(fifo_depth / 2 - 1) | TX_WMARK(fifo_depth / 2);
-       priv->drvsel = fdtdec_get_uint(gd->fdt_blob, dev->of_offset,
+       priv->drvsel = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
                                       "drvsel", 3);
-       priv->smplsel = fdtdec_get_uint(gd->fdt_blob, dev->of_offset,
+       priv->smplsel = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
                                        "smplsel", 0);
        host->priv = priv;
 
@@ -109,13 +141,18 @@ static int socfpga_dwmmc_probe(struct udevice *dev)
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
        struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev);
        struct dwmci_host *host = &priv->host;
+       int ret;
+
+       ret = socfpga_dwmmc_get_clk_rate(dev);
+       if (ret)
+               return ret;
+
+       socfpga_dwmci_reset(dev);
 
 #ifdef CONFIG_BLK
-       dwmci_setup_cfg(&plat->cfg, dev->name, host->buswidth, host->caps,
-                       host->bus_hz, 400000);
+       dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, 400000);
        host->mmc = &plat->mmc;
 #else
-       int ret;
 
        ret = add_dwmci(host, host->bus_hz, 400000);
        if (ret)
@@ -125,7 +162,7 @@ static int socfpga_dwmmc_probe(struct udevice *dev)
        upriv->mmc = host->mmc;
        host->mmc->dev = dev;
 
-       return 0;
+       return dwmci_probe(dev);
 }
 
 static int socfpga_dwmmc_bind(struct udevice *dev)
@@ -152,7 +189,9 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
        .id             = UCLASS_MMC,
        .of_match       = socfpga_dwmmc_ids,
        .ofdata_to_platdata = socfpga_dwmmc_ofdata_to_platdata,
+       .ops            = &dm_dwmci_ops,
        .bind           = socfpga_dwmmc_bind,
        .probe          = socfpga_dwmmc_probe,
        .priv_auto_alloc_size = sizeof(struct dwmci_socfpga_priv_data),
+       .platdata_auto_alloc_size = sizeof(struct socfpga_dwmci_plat),
 };