]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - drivers/mmc/rockchip_dw_mmc.c
Merge git://git.denx.de/u-boot-spi
[people/ms/u-boot.git] / drivers / mmc / rockchip_dw_mmc.c
index aeaec6c86588ce3ac7e86e21daef708f74c0775c..807dc9e72f6683b338d575d3a7db2df39712e249 100644 (file)
@@ -7,19 +7,33 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <dt-structs.h>
 #include <dwmmc.h>
 #include <errno.h>
+#include <mapmem.h>
+#include <pwrseq.h>
 #include <syscon.h>
+#include <asm/gpio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/periph.h>
 #include <linux/err.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+struct rockchip_mmc_plat {
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       struct dtd_rockchip_rk3288_dw_mshc dtplat;
+#endif
+       struct mmc_config cfg;
+       struct mmc mmc;
+};
+
 struct rockchip_dwmmc_priv {
-       struct udevice *clk;
-       struct rk3288_grf *grf;
+       struct clk clk;
        struct dwmci_host host;
+       int fifo_depth;
+       bool fifo_mode;
+       u32 minmax[2];
 };
 
 static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq)
@@ -28,8 +42,7 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq)
        struct rockchip_dwmmc_priv *priv = dev_get_priv(dev);
        int ret;
 
-       ret = clk_set_periph_rate(priv->clk, PERIPH_ID_SDMMC0 + host->dev_index,
-                                 freq);
+       ret = clk_set_rate(&priv->clk, freq);
        if (ret < 0) {
                debug("%s: err=%d\n", __func__, ret);
                return ret;
@@ -40,61 +53,109 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq)
 
 static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
 {
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
        struct rockchip_dwmmc_priv *priv = dev_get_priv(dev);
        struct dwmci_host *host = &priv->host;
 
        host->name = dev->name;
-       host->ioaddr = (void *)dev_get_addr(dev);
-       host->buswidth = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-                                       "bus-width", 4);
+       host->ioaddr = dev_read_addr_ptr(dev);
+       host->buswidth = dev_read_u32_default(dev, "bus-width", 4);
        host->get_mmc_clk = rockchip_dwmmc_get_mmc_clk;
        host->priv = dev;
 
        /* use non-removeable as sdcard and emmc as judgement */
-       if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "non-removable"))
+       if (dev_read_bool(dev, "non-removable"))
+               host->dev_index = 0;
+       else
                host->dev_index = 1;
 
+       priv->fifo_depth = dev_read_u32_default(dev, "fifo-depth", 0);
+
+       if (priv->fifo_depth < 0)
+               return -EINVAL;
+       priv->fifo_mode = dev_read_bool(dev, "fifo-mode");
+
+       /*
+        * 'clock-freq-min-max' is deprecated
+        * (see https://github.com/torvalds/linux/commit/b023030f10573de738bbe8df63d43acab64c9f7b)
+        */
+       if (dev_read_u32_array(dev, "clock-freq-min-max", priv->minmax, 2)) {
+               int val = dev_read_u32_default(dev, "max-frequency", -EINVAL);
+
+               if (val < 0)
+                       return val;
+
+               priv->minmax[0] = 400000;  /* 400 kHz */
+               priv->minmax[1] = val;
+       } else {
+               debug("%s: 'clock-freq-min-max' property was deprecated.\n",
+                     __func__);
+       }
+#endif
        return 0;
 }
 
 static int rockchip_dwmmc_probe(struct udevice *dev)
 {
+       struct rockchip_mmc_plat *plat = dev_get_platdata(dev);
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
        struct rockchip_dwmmc_priv *priv = dev_get_priv(dev);
        struct dwmci_host *host = &priv->host;
-       u32 minmax[2];
+       struct udevice *pwr_dev __maybe_unused;
        int ret;
-       int fifo_depth;
 
-       priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
-       if (IS_ERR(priv->grf))
-               return PTR_ERR(priv->grf);
-       ret = uclass_get_device(UCLASS_CLK, CLK_GENERAL, &priv->clk);
-       if (ret)
-               return ret;
-
-       if (fdtdec_get_int_array(gd->fdt_blob, dev->of_offset,
-                                "clock-freq-min-max", minmax, 2))
-               return -EINVAL;
-
-       fifo_depth = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-                                   "fifo-depth", 0);
-       if (fifo_depth < 0)
-               return -EINVAL;
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       struct dtd_rockchip_rk3288_dw_mshc *dtplat = &plat->dtplat;
 
+       host->name = dev->name;
+       host->ioaddr = map_sysmem(dtplat->reg[0], dtplat->reg[1]);
+       host->buswidth = dtplat->bus_width;
+       host->get_mmc_clk = rockchip_dwmmc_get_mmc_clk;
+       host->priv = dev;
+       host->dev_index = 0;
+       priv->fifo_depth = dtplat->fifo_depth;
+       priv->fifo_mode = 0;
+       priv->minmax[0] = 400000;  /*  400 kHz */
+       priv->minmax[1] = dtplat->max_frequency;
+
+       ret = clk_get_by_index_platdata(dev, 0, dtplat->clocks, &priv->clk);
+       if (ret < 0)
+               return ret;
+#else
+       ret = clk_get_by_index(dev, 0, &priv->clk);
+       if (ret < 0)
+               return ret;
+#endif
        host->fifoth_val = MSIZE(0x2) |
-               RX_WMARK(fifo_depth / 2 - 1) | TX_WMARK(fifo_depth / 2);
-
-       if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "fifo-mode"))
-               host->fifo_mode = true;
+               RX_WMARK(priv->fifo_depth / 2 - 1) |
+               TX_WMARK(priv->fifo_depth / 2);
+
+       host->fifo_mode = priv->fifo_mode;
+
+#ifdef CONFIG_PWRSEQ
+       /* Enable power if needed */
+       ret = uclass_get_device_by_phandle(UCLASS_PWRSEQ, dev, "mmc-pwrseq",
+                                          &pwr_dev);
+       if (!ret) {
+               ret = pwrseq_set_power(pwr_dev, true);
+               if (ret)
+                       return ret;
+       }
+#endif
+       dwmci_setup_cfg(&plat->cfg, host, priv->minmax[1], priv->minmax[0]);
+       host->mmc = &plat->mmc;
+       host->mmc->priv = &priv->host;
+       host->mmc->dev = dev;
+       upriv->mmc = host->mmc;
 
-       ret = add_dwmci(host, minmax[1], minmax[0]);
-       if (ret)
-               return ret;
+       return dwmci_probe(dev);
+}
 
-       upriv->mmc = host->mmc;
+static int rockchip_dwmmc_bind(struct udevice *dev)
+{
+       struct rockchip_mmc_plat *plat = dev_get_platdata(dev);
 
-       return 0;
+       return dwmci_bind(dev, &plat->mmc, &plat->cfg);
 }
 
 static const struct udevice_id rockchip_dwmmc_ids[] = {
@@ -103,10 +164,47 @@ static const struct udevice_id rockchip_dwmmc_ids[] = {
 };
 
 U_BOOT_DRIVER(rockchip_dwmmc_drv) = {
-       .name           = "rockchip_dwmmc",
+       .name           = "rockchip_rk3288_dw_mshc",
        .id             = UCLASS_MMC,
        .of_match       = rockchip_dwmmc_ids,
        .ofdata_to_platdata = rockchip_dwmmc_ofdata_to_platdata,
+       .ops            = &dm_dwmci_ops,
+       .bind           = rockchip_dwmmc_bind,
        .probe          = rockchip_dwmmc_probe,
        .priv_auto_alloc_size = sizeof(struct rockchip_dwmmc_priv),
+       .platdata_auto_alloc_size = sizeof(struct rockchip_mmc_plat),
+};
+
+#ifdef CONFIG_PWRSEQ
+static int rockchip_dwmmc_pwrseq_set_power(struct udevice *dev, bool enable)
+{
+       struct gpio_desc reset;
+       int ret;
+
+       ret = gpio_request_by_name(dev, "reset-gpios", 0, &reset, GPIOD_IS_OUT);
+       if (ret)
+               return ret;
+       dm_gpio_set_value(&reset, 1);
+       udelay(1);
+       dm_gpio_set_value(&reset, 0);
+       udelay(200);
+
+       return 0;
+}
+
+static const struct pwrseq_ops rockchip_dwmmc_pwrseq_ops = {
+       .set_power      = rockchip_dwmmc_pwrseq_set_power,
+};
+
+static const struct udevice_id rockchip_dwmmc_pwrseq_ids[] = {
+       { .compatible = "mmc-pwrseq-emmc" },
+       { }
+};
+
+U_BOOT_DRIVER(rockchip_dwmmc_pwrseq_drv) = {
+       .name           = "mmc_pwrseq_emmc",
+       .id             = UCLASS_PWRSEQ,
+       .of_match       = rockchip_dwmmc_pwrseq_ids,
+       .ops            = &rockchip_dwmmc_pwrseq_ops,
 };
+#endif