On 15 August 2016 at 10:19, Haibo Chen <haibo.chen@xxxxxxx> wrote: > Now, when call esdhc_set_timeout() to set the data timeout counter value, > IPP_RST_N(bit 23) is wrongly affected. This patch add a mask to avoid this. > > Signed-off-by: Haibo Chen <haibo.chen@xxxxxxx>' Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 99e0b33..437c448 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -31,6 +31,7 @@ > #include "sdhci-pltfm.h" > #include "sdhci-esdhc.h" > > +#define ESDHC_SYS_CTRL_DTOCV_MASK 0x0f > #define ESDHC_CTRL_D3CD 0x08 > #define ESDHC_BURST_LEN_EN_INCR (1 << 27) > /* VENDOR SPEC register */ > @@ -937,7 +938,8 @@ static void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) > struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host); > > /* use maximum timeout counter */ > - sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE, > + esdhc_clrset_le(host, ESDHC_SYS_CTRL_DTOCV_MASK, > + esdhc_is_usdhc(imx_data) ? 0xF : 0xE, > SDHCI_TIMEOUT_CONTROL); > } > > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
