| Message ID | 1381739024-24924-3-git-send-email-shawn.guo@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Montag, den 14.10.2013, 16:23 +0800 schrieb Shawn Guo: > Add flag ESDHC_FLAG_ENGCM07207 for enabling the workaround for errata > ENGcm07207 and set the flag for i.MX25 and i.MX35 ESDHC. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index e046917..a5d7d15 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -89,6 +89,11 @@ > * exeception. Bit1 of Vendor Spec registor is used to fix it. > */ > #define ESDHC_FLAG_MULTIBLK_NO_INT BIT(1) > +/* > + * The flag enables the workaround for ESDHC errata ENGcm07207 which > + * presents on i.MX25 and i.MX35. s/presents/is present/ > + */ > +#define ESDHC_FLAG_ENGCM07207 BIT(2) > > enum imx_esdhc_type { > IMX25_ESDHC, > @@ -865,6 +870,9 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > if (is_imx25_esdhc(imx_data)) > imx_data->flags |= ESDHC_FLAG_NO_DMAS_BITS; > > + if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data)) > + imx_data->flags |= ESDHC_FLAG_ENGCM07207; > + > imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > if (IS_ERR(imx_data->clk_ipg)) { > err = PTR_ERR(imx_data->clk_ipg); > @@ -905,7 +913,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > > host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; > > - if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data)) > + if (imx_data->flags & ESDHC_FLAG_ENGCM07207) > /* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */ > host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK > | SDHCI_QUIRK_BROKEN_ADMA;
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index e046917..a5d7d15 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -89,6 +89,11 @@ * exeception. Bit1 of Vendor Spec registor is used to fix it. */ #define ESDHC_FLAG_MULTIBLK_NO_INT BIT(1) +/* + * The flag enables the workaround for ESDHC errata ENGcm07207 which + * presents on i.MX25 and i.MX35. + */ +#define ESDHC_FLAG_ENGCM07207 BIT(2) enum imx_esdhc_type { IMX25_ESDHC, @@ -865,6 +870,9 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) if (is_imx25_esdhc(imx_data)) imx_data->flags |= ESDHC_FLAG_NO_DMAS_BITS; + if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data)) + imx_data->flags |= ESDHC_FLAG_ENGCM07207; + imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); if (IS_ERR(imx_data->clk_ipg)) { err = PTR_ERR(imx_data->clk_ipg); @@ -905,7 +913,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; - if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data)) + if (imx_data->flags & ESDHC_FLAG_ENGCM07207) /* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */ host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK | SDHCI_QUIRK_BROKEN_ADMA;
Add flag ESDHC_FLAG_ENGCM07207 for enabling the workaround for errata ENGcm07207 and set the flag for i.MX25 and i.MX35 ESDHC. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- drivers/mmc/host/sdhci-esdhc-imx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)