Re: [PATCH v4 09/12] rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support

[Kever Yang]

Hi Johan,

On 2022/4/4 07:06, Johan Jonker wrote:

The Rockchip SoCs rk3066/rk3188 have mmc DT nodes
with as compatible string "rockchip,rk2928-dw-mshc".
Add support to the existing driver with help of
a DM_DRIVER_ALIAS.

This type needs a permanent enabled fifo.
The other Rockchip SoCs not always have the property
"fifo-mode" in the TPL/SPL DT nodes, so dtplat structures
can't be used to switch it on.

There is an option "u-boot,spl-fifo-mode", which already used for many SoCs,

could you try with it?


Thanks,

- Kever

Add a data structure linked to the compatible string
to enable.

Signed-off-by: Johan Jonker <jbx6...@gmail.com>
---

Changed V4:
   use boolean
---
  drivers/mmc/rockchip_dw_mmc.c | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index be065ec0c3..45488dd7bd 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -19,6 +19,11 @@
  #include <linux/delay.h>
  #include <linux/err.h>

+enum rockchip_dwmmc_type {

+       RK2928_MSHC,
+       RK3288_MSHC,
+};
+
  struct rockchip_mmc_plat {
  #if CONFIG_IS_ENABLED(OF_PLATDATA)
        struct dtd_rockchip_rk3288_dw_mshc dtplat;
@@ -111,6 +116,7 @@ static int rockchip_dwmmc_probe(struct udevice *dev)

#if CONFIG_IS_ENABLED(OF_PLATDATA)

        struct dtd_rockchip_rk3288_dw_mshc *dtplat = &plat->dtplat;
+       enum rockchip_dwmmc_type type = dev_get_driver_data(dev);

host->name = dev->name;

        host->ioaddr = map_sysmem(dtplat->reg[0], dtplat->reg[1]);
@@ -119,7 +125,10 @@ static int rockchip_dwmmc_probe(struct udevice *dev)
        host->priv = dev;
        host->dev_index = 0;
        priv->fifo_depth = dtplat->fifo_depth;
-       priv->fifo_mode = 0;
+       if (type == RK2928_MSHC)
+               priv->fifo_mode = true;
+       else
+               priv->fifo_mode = false;
        priv->minmax[0] = 400000;  /*  400 kHz */
        priv->minmax[1] = dtplat->max_frequency;

@@ -163,8 +172,8 @@ static int rockchip_dwmmc_bind(struct udevice *dev)

  }

static const struct udevice_id rockchip_dwmmc_ids[] = {

-       { .compatible = "rockchip,rk2928-dw-mshc" },
-       { .compatible = "rockchip,rk3288-dw-mshc" },
+       { .compatible = "rockchip,rk2928-dw-mshc", .data = RK2928_MSHC },
+       { .compatible = "rockchip,rk3288-dw-mshc", .data = RK3288_MSHC },
        { }
  };

@@ -180,5 +189,6 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = {

        .plat_auto      = sizeof(struct rockchip_mmc_plat),
  };

+DM_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk2928_dw_mshc)

  DM_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc)
  DM_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3368_dw_mshc)