mmc: rk_sdmmc: enhance recovery flow

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / dw_mmc-rockchip.c

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index ad998fbab5459ee86620b1028d4e089069dd2850..f0ed5643b2f56d43ecd1dc700f798d155e86c056 100755 (executable)
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -83,8 +83,20 @@ static int dw_mci_rockchip_priv_init(struct dw_mci *host)
                                            rockchip_compat[idx].compatible)) {
                        priv->ctrl_type = rockchip_compat[idx].ctrl_type;
                        host->cid = priv->ctrl_type;
-                       host->grf = syscon_find(host->dev->of_node,
-                                               "rockchip,grf");
+                       if (priv->ctrl_type == DW_MCI_TYPE_RK3368) {
+                               host->grf = syscon_regmap_lookup_by_phandle(
+                                               host->dev->of_node, "rockchip,grf");
+                               if (IS_ERR(host->grf)) {
+                                       pr_err("No rockchip,grf phandle specified");
+                                       return PTR_ERR(host->grf);
+                               }
+                               host->cru = syscon_regmap_lookup_by_phandle(
+                                       host->dev->of_node, "rockchip,cru");
+                               if (IS_ERR(host->cru)) {
+                                       pr_err("No rockchip,cru phandle specified");
+                                       return PTR_ERR(host->cru);
+                               }
+                       }
                }
        }