Commit 31fbb301 authored by Shawn Guo's avatar Shawn Guo Committed by Chris Ball
Browse files

mmc: sdhci-esdhc-imx: add flag ESDHC_FLAG_ENGCM07207 



Just like the use of the flag ESDHC_FLAG_MULTIBLK_NO_INT, let's add
another flag ESDHC_FLAG_ENGCM07207 to enable the workaround for errata
ENGcm07207 and set the flag for i.MX25 and i.MX35 ESDHC.

While at it, let's use BIT() macro for ESDHC_FLAG_MULTIBLK_NO_INT as
well.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarDong Aisheng <b29396@freescale.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent e69e4dff

drivers/mmc/host/sdhci-esdhc-imx.c

+10 −2
Original line number Diff line number Diff line
@@ -83,7 +83,12 @@ 
 * As a result, the TC flag is not asserted and SW  received timeout

 * exeception. Bit1 of Vendor Spec registor is used to fix it.

 */

#define ESDHC_FLAG_MULTIBLK_NO_INT	(1 << 1)

#define ESDHC_FLAG_MULTIBLK_NO_INT	BIT(1)

/*

 * The flag enables the workaround for ESDHC errata ENGcm07207 which

 * affects i.MX25 and i.MX35.

 */

#define ESDHC_FLAG_ENGCM07207		BIT(2)



enum imx_esdhc_type {

	IMX25_ESDHC,
@@ -857,6 +862,9 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	imx_data->devtype = pdev->id_entry->driver_data;

	pltfm_host->priv = imx_data;



	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);
@@ -897,7 +905,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;