diff mbox series

mmc: dw_mmc-rockchip: Just set default sample value for legacy mode

Message ID 1618539454-182170-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive)
State New
Headers show
Series mmc: dw_mmc-rockchip: Just set default sample value for legacy mode | expand

Commit Message

Shawn Lin April 16, 2021, 2:17 a.m. UTC
.set_ios() is called from .resume() as well. For SDIO device which sets
keep-power-in-suspend, nothing should be changed after resuming, as well
as sample tuning value, since this value is tuned already. So we should
not overwrite it with the default value.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---

 drivers/mmc/host/dw_mmc-rockchip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson April 16, 2021, 1:13 p.m. UTC | #1
On Fri, 16 Apr 2021 at 04:17, Shawn Lin <shawn.lin@rock-chips.com> wrote:
>
> .set_ios() is called from .resume() as well. For SDIO device which sets
> keep-power-in-suspend, nothing should be changed after resuming, as well
> as sample tuning value, since this value is tuned already. So we should
> not overwrite it with the default value.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

Applied for next, thanks!

Kind regards
Uffe

> ---
>
>  drivers/mmc/host/dw_mmc-rockchip.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
> index 753502c..d36991a 100644
> --- a/drivers/mmc/host/dw_mmc-rockchip.c
> +++ b/drivers/mmc/host/dw_mmc-rockchip.c
> @@ -61,7 +61,7 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios)
>         }
>
>         /* Make sure we use phases which we can enumerate with */
> -       if (!IS_ERR(priv->sample_clk))
> +       if (!IS_ERR(priv->sample_clk) && ios->timing <= MMC_TIMING_SD_HS)
>                 clk_set_phase(priv->sample_clk, priv->default_sample_phase);
>
>         /*
> --
> 2.7.4
>
>
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index 753502c..d36991a 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -61,7 +61,7 @@  static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios)
 	}
 
 	/* Make sure we use phases which we can enumerate with */
-	if (!IS_ERR(priv->sample_clk))
+	if (!IS_ERR(priv->sample_clk) && ios->timing <= MMC_TIMING_SD_HS)
 		clk_set_phase(priv->sample_clk, priv->default_sample_phase);
 
 	/*