[PATCH] mmc: sdhci-of-arasan: Properly set corecfg_clockmultipler on rk3399

Shawn Lin shawn.lin at rock-chips.com
Thu Aug 25 20:22:16 PDT 2016

corecfg_clockmultipler indicates clock multiplier value of
programmable clock generator which should be the same value
of SDHCI_CAPABILITIES_1. The default value of the register,
corecfg_clockmultipler, is 0x10. But actually it is a mistake
by designer as our intention was to set it to be zero which
means we don't support programmable clock generator. So we have
to made it to be zero on bootloader which seems work fine until
now. But now we find a issue that when deploying genpd support
for it, the remove callback will trigger the genpd to poweroff the
power domain for sdhci-of-arasan which magage the controller, phy
and corecfg_* stuff.

So when we do bind/unbind the driver, we have already reinit
the controller and phy, but without doing that for corecfg_*.
Regarding to only the corecfg_clockmultipler is wrong, let's
fix it by explicitly marking it to be zero when probing. With
this change, we could do bind/unbind successfully.

Reported-by: Ziyuan Xu <xzy.xu at rock-chips.com>
Cc: Douglas Anderson <dianders at chromium.org>
Signed-off-by: Shawn Lin <shawn.lin at rock-chips.com>

 drivers/mmc/host/sdhci-of-arasan.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 0b3a9cf..c1eb263 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -67,10 +67,12 @@ struct sdhci_arasan_soc_ctl_field {
  * accessible via the syscon API.
  * @baseclkfreq:	Where to find corecfg_baseclkfreq
+ * @clockmultiplier:	Where to find corecfg_clockmultiplier
  * @hiword_update:	If true, use HIWORD_UPDATE to access the syscon
 struct sdhci_arasan_soc_ctl_map {
 	struct sdhci_arasan_soc_ctl_field	baseclkfreq;
+	struct sdhci_arasan_soc_ctl_field	clockmultiplier;
 	bool					hiword_update;
@@ -100,6 +102,7 @@ struct sdhci_arasan_data {
 static const struct sdhci_arasan_soc_ctl_map rk3399_soc_ctl_map = {
 	.baseclkfreq = { .reg = 0xf000, .width = 8, .shift = 8 },
+	.clockmultiplier = { .reg = 0xf02c, .width = 8, .shit = 0},
 	.hiword_update = true,
@@ -528,6 +531,12 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
 			goto err_pltfm_free;
+		if (of_device_is_compatible(pdev->dev.of_node,
+					    "rockchip,rk3399-sdhci-5.1"))
+			sdhci_arasan_syscon_write(host,
+						  &soc_ctl_map->clockmultiplier,
+						  0);
 	sdhci_arasan->clk_ahb = devm_clk_get(&pdev->dev, "clk_ahb");

More information about the Linux-rockchip mailing list