mmc: rockchip_sdhci: Use set_clock and config_dll sdhci_ops
Subsystems (2)
PATCH v3 6/17 mmc: rockchip_sdhci: Use set_clock and config_dll sdhci_ops
Change to configure clock and DLL in set_clock and config_dll ops instead of in the set_ios_post ops.
With this change the output clock is turned off while configuring DLL parameters, according to the design recommendations.
Signed-off-by Jonas Karlman <[email protected]>
Reviewed-by Kever Yang <[email protected]>
---
v3:
- Resolve conflict with "rockchip: sdhci: rk3568: fix clock setting logic" at [1]
- Collect r-b tag
v2:
- No change
[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
drivers/mmc/rockchip_sdhci.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/mmc/rockchip_sdhci.c +15 -13
@@ -291,18 +291,24 @@ static int rk3399_sdhci_set_ios_post(struct sdhci_host *host)return 0 ; } -static int rk3568_sdhci_emmc_set_clock (struct sdhci_host *host,unsigned int clock) +static void rk3568_sdhci_set_clock (struct sdhci_host *host,u32 div) { struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); +struct mmc *mmc = host->mmc; +ulong rate; + + rate =clk_set_rate (&priv->emmc_clk, mmc->clock); +if (IS_ERR_VALUE (rate)) +printf ("%s: Set clock rate failed: %ld\n" , __func__, (long )rate); +} + +static int rk3568_sdhci_config_dll (struct sdhci_host *host,u32 clock,bool enable) +{int val, ret;u32 extra; -if (clock > host->max_clk) - clock = host->max_clk; -if (clock) -clk_set_rate (&priv->emmc_clk, clock); - -sdhci_set_clock (host->mmc, clock); +if (!enable) +return 0 ;if (clock >=100 * MHz) {/* reset DLL */
@@ -386,14 +392,8 @@ static int rk3568_sdhci_set_enhanced_strobe(struct sdhci_host *host)static int rk3568_sdhci_set_ios_post (struct sdhci_host *host) {struct mmc *mmc = host->mmc; -uint clock = mmc->clock;u32 reg, vendor_reg; -if (mmc->tran_speed && mmc->clock > mmc->tran_speed) - clock = mmc->tran_speed; - -rk3568_sdhci_emmc_set_clock (host, clock); -if (mmc->selected_mode ==MMC_HS_400 || mmc->selected_mode ==MMC_HS_400_ES ) { reg =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); reg &= ~SDHCI_CTRL_UHS_MASK ;
@@ -601,6 +601,8 @@ static const struct sdhci_data rk3399_data = {static const struct sdhci_data rk3568_data = { .get_phy = rk3568_emmc_get_phy, .set_ios_post = rk3568_sdhci_set_ios_post, + .set_clock = rk3568_sdhci_set_clock, + .config_dll = rk3568_sdhci_config_dll, .set_enhanced_strobe = rk3568_sdhci_set_enhanced_strobe, };
Signature · 1 line
2.40.0