mmc: fsl_esdhc_imx: optimize the timing setting
Subsystems (2)
PATCH 1/1 mmc: fsl_esdhc_imx: optimize the timing setting
From: Haibo Chen <[email protected]>
For imx usdhc/esdhc, once set the DDR_EN, enable the DDR mode, the card clock will be divied by 2 automatically by the host. So need to first config the DDR_EN correctly, then update the card clock. This will make sure the actual card clock is as our expected. IC also suggest config the DDR_EN firstly, then config the clock divider.
For HS400/HS400ES mode, need to config the strobe dll, this need to based on the correct target clock rate, so need to do this after clock rate is update.
--- drivers/mmc/fsl_esdhc_imx.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +24 -8
@@ -760,7 +760,6 @@ static int esdhc_set_timing(struct mmc *mmc)case MMC_HS_400_ES : mixctrl |=MIX_CTRL_DDREN |MIX_CTRL_HS400_EN ;esdhc_write32 (®s->mixctrl, mixctrl); -esdhc_set_strobe_dll (mmc);break ;case MMC_HS :case MMC_HS_52 :
@@ -933,6 +932,23 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)int ret__maybe_unused ;u32 clock; +#ifdef MMC_SUPPORTS_TUNING +/* +* call esdhc_set_timing() before update the clock rate, +* This is because current we support DDR and SDR mode, +* Once the DDR_EN bit is set, the card clock will be +* divide by 2 automatically. So need to do this before +* setting clock rate. +*/ +if (priv->mode != mmc->selected_mode) { + ret =esdhc_set_timing (mmc); +if (ret) { +printf ("esdhc_set_timing error %d\n" , ret); +return ret; + } + } +#endif +/* Set the clock speed */ clock = mmc->clock;if (clock < mmc->cfg->f_min)
@@ -957,13 +973,13 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)#endif } -if (priv->mode != mmc->selected_mode) { - ret =esdhc_set_timing (mmc); -if (ret) { -printf ("esdhc_set_timing error %d\n" , ret); -return ret; - } - } +/* +* For HS400/HS400ES mode, make sure set the strobe dll in the +* target clock rate. So call esdhc_set_strobe_dll() after the +* clock updated. +*/ +if (mmc->selected_mode ==MMC_HS_400 || mmc->selected_mode ==MMC_HS_400_ES ) +esdhc_set_strobe_dll (mmc);if (priv->signal_voltage != mmc->signal_voltage) { ret =esdhc_set_voltage (mmc);
Signature · 1 line
2.17.1
PATCH 1/1 mmc: fsl_esdhc_imx: optimize the timing setting
Quoted 9 lines · haibo.chen at nxp.com
From: Haibo Chen <[email protected]>
For imx usdhc/esdhc, once set the
DDR_EN, enable the DDR mode, the card clock will be divied by 2 automatically by the host. So need to first config theDDR_ENcorrectly, then update the card clock. This will make sure the actual card clock is as our expected. IC also suggest config theDDR_ENfirstly, then config the clock divider.
Quoted 5 lines
For HS400/HS400ES mode, need to config the strobe dll, this need to based on the correct target clock rate, so need to do this after clock rate is update.
Signed-off-by Haibo Chen <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 62 lines
--- drivers/mmc/fsl_esdhc_imx.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)drivers/mmc/fsl_esdhc_imx.c +24
-8@@ -760,7 +760,6 @@ static int esdhc_set_timing(struct mmc *mmc)case MMC_HS_400_ES : mixctrl |=MIX_CTRL_DDREN |MIX_CTRL_HS400_EN ;esdhc_write32 (®s->mixctrl, mixctrl); -esdhc_set_strobe_dll (mmc);break ;case MMC_HS :case MMC_HS_52 :@@ -933,6 +932,23 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)int ret__maybe_unused ;u32 clock; +#ifdef MMC_SUPPORTS_TUNING +/* +* call esdhc_set_timing() before update the clock rate, +* This is because current we support DDR and SDR mode, +* Once the DDR_EN bit is set, the card clock will be +* divide by 2 automatically. So need to do this before +* setting clock rate. +*/ +if (priv->mode != mmc->selected_mode) { + ret =esdhc_set_timing (mmc); +if (ret) { +printf ("esdhc_set_timing error %d\n" , ret); +return ret; + } + } +#endif +/* Set the clock speed */ clock = mmc->clock;if (clock < mmc->cfg->f_min)@@ -957,13 +973,13 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)#endif } -if (priv->mode != mmc->selected_mode) { - ret =esdhc_set_timing (mmc); -if (ret) { -printf ("esdhc_set_timing error %d\n" , ret); -return ret; - } - } +/* +* For HS400/HS400ES mode, make sure set the strobe dll in the +* target clock rate. So call esdhc_set_strobe_dll() after the +* clock updated. +*/ +if (mmc->selected_mode ==MMC_HS_400 || mmc->selected_mode ==MMC_HS_400_ES ) +esdhc_set_strobe_dll (mmc);if (priv->signal_voltage != mmc->signal_voltage) { ret =esdhc_set_voltage (mmc);
PATCH 1/1 mmc: fsl_esdhc_imx: optimize the timing setting
In reply to haibo.chen at nxp.comQuoted 10 lines
From: Haibo Chen <[email protected]>
For imx usdhc/esdhc, once set theDDR_EN, enable the DDR mode, the card clock will be divied by 2 automatically by the host. So need to first config theDDR_ENcorrectly, then update the card clock. This will make sure the actual card clock is as our expected. IC also suggest config theDDR_ENfirstly, then config the clock divider.
For HS400/HS400ES mode, need to config the strobe dll, this need to based on the correct target clock rate, so need to do this after clock rate is update.
Quoted 2 lines
Signed-off-by Haibo Chen <[email protected]>Reviewed-by Jaehoon Chung <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================