mmc: dw_mmc-rockchip: Add support for rk3576 SoCs

On rk3576 the tunable clocks are inside the controller itself, removing
the need for the "ciu-drive" and "ciu-sample" clocks.

That makes it a new type of controller that has its own dt_parse function.

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/010201919997044d-c3a008d1-afbc-462f-a928-fc1ece785bdb-000000@eu-west-1.amazonses.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index 75e9ac4bcd083c84feca582dacc2e05309bf7ff1..f96260fd143b4c80102b0096f1d5760c322aff66 100644 (file)
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -407,7 +407,7 @@ free:
        return ret;
 }
 
-static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
+static int dw_mci_common_parse_dt(struct dw_mci *host)
 {
        struct device_node *np = host->dev->of_node;
        struct dw_mci_rockchip_priv_data *priv;
@@ -417,13 +417,29 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
                return -ENOMEM;
 
        if (of_property_read_u32(np, "rockchip,desired-num-phases",
-                                       &priv->num_phases))
+                                &priv->num_phases))
                priv->num_phases = 360;
 
        if (of_property_read_u32(np, "rockchip,default-sample-phase",
-                                       &priv->default_sample_phase))
+                                &priv->default_sample_phase))
                priv->default_sample_phase = 0;
 
+       host->priv = priv;
+
+       return 0;
+}
+
+static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
+{
+       struct dw_mci_rockchip_priv_data *priv;
+       int err;
+
+       err = dw_mci_common_parse_dt(host);
+       if (err)
+               return err;
+
+       priv = host->priv;
+
        priv->drv_clk = devm_clk_get(host->dev, "ciu-drive");
        if (IS_ERR(priv->drv_clk))
                dev_dbg(host->dev, "ciu-drive not available\n");
@@ -432,13 +448,25 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
        if (IS_ERR(priv->sample_clk))
                dev_dbg(host->dev, "ciu-sample not available\n");
 
-       host->priv = priv;
-
        priv->internal_phase = false;
 
        return 0;
 }
 
+static int dw_mci_rk3576_parse_dt(struct dw_mci *host)
+{
+       struct dw_mci_rockchip_priv_data *priv;
+       int err = dw_mci_common_parse_dt(host);
+       if (err)
+               return err;
+
+       priv = host->priv;
+
+       priv->internal_phase = true;
+
+       return 0;
+}
+
 static int dw_mci_rockchip_init(struct dw_mci *host)
 {
        int ret, i;
@@ -480,11 +508,21 @@ static const struct dw_mci_drv_data rk3288_drv_data = {
        .init                   = dw_mci_rockchip_init,
 };
 
+static const struct dw_mci_drv_data rk3576_drv_data = {
+       .common_caps            = MMC_CAP_CMD23,
+       .set_ios                = dw_mci_rk3288_set_ios,
+       .execute_tuning         = dw_mci_rk3288_execute_tuning,
+       .parse_dt               = dw_mci_rk3576_parse_dt,
+       .init                   = dw_mci_rockchip_init,
+};
+
 static const struct of_device_id dw_mci_rockchip_match[] = {
        { .compatible = "rockchip,rk2928-dw-mshc",
                .data = &rk2928_drv_data },
        { .compatible = "rockchip,rk3288-dw-mshc",
                .data = &rk3288_drv_data },
+       { .compatible = "rockchip,rk3576-dw-mshc",
+               .data = &rk3576_drv_data },
        {},
 };
 MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);