summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZiyuan Xu <xzy.xu@rock-chips.com>2017-05-15 09:07:21 +0300
committerKever Yang <kever.yang@rock-chips.com>2017-07-18 17:08:31 +0300
commit44346aa3d69a0ecc3ce0d6e6153e7b03ba6883be (patch)
tree81c6c4f0d50cef5523930768a04177b3b9123c5a
parentd51d202ec07c059f3dd0a82408db55925991521f (diff)
downloadu-boot-44346aa3d69a0ecc3ce0d6e6153e7b03ba6883be.tar.xz
mmc: sdhci: rename set_clock callback
In fact, the original name is unsuitable for its behavior. It's better to rename to set_clock_ext. Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
-rw-r--r--drivers/mmc/s5p_sdhci.c4
-rw-r--r--drivers/mmc/sdhci.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 62817a0d07..95447310ab 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -73,14 +73,14 @@ static void s5p_sdhci_set_control_reg(struct sdhci_host *host)
sdhci_writel(host, ctrl, SDHCI_CONTROL2);
}
-static void s5p_set_clock(struct sdhci_host *host, u32 div)
+static void s5p_set_clock_ext(struct sdhci_host *host, u32 div)
{
/* ToDo : Use the Clock Framework */
set_mmc_clk(host->index, div);
}
static const struct sdhci_ops s5p_sdhci_ops = {
- .set_clock = &s5p_set_clock,
+ .set_clock_ext = &s5p_set_clock_ext,
.set_control_reg = &s5p_sdhci_set_control_reg,
};
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index c80a958ca2..a2d166040d 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -365,8 +365,8 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
div >>= 1;
}
- if (host->ops && host->ops->set_clock)
- host->ops->set_clock(host, div);
+ if (host->ops && host->ops->set_clock_ext)
+ host->ops->set_clock_ext(host, div);
clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT;
clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN)