[PATCH 2/5] mmc: sdhci-esdhc: broken card detection is not a default quirk

[Wolfram Sang]

Adding Anton to Cc...

On Thu, Feb 10, 2011 at 08:14:48PM +0100, Wolfram Sang wrote:
> It can be worked around using a GPIO which will be done for i.MX later.
> 
> Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
> ---
>  drivers/mmc/host/sdhci-esdhc-imx.c |    3 ++-
>  drivers/mmc/host/sdhci-esdhc.h     |    1 -
>  drivers/mmc/host/sdhci-of-esdhc.c  |    3 ++-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
> index 83d178b..e0fa1f3 100644
> --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> @@ -170,7 +170,8 @@ static void esdhc_pltfm_exit(struct sdhci_host *host)
>  }
>  
>  struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
> -	.quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_ADMA,
> +	.quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_ADMA
> +			| SDHCI_QUIRK_BROKEN_CARD_DETECTION,
>  	/* ADMA has issues. Might be fixable */
>  	.ops = &sdhci_esdhc_ops,
>  	.init = esdhc_pltfm_init,
> diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h
> index afaf1bc..c55aae8 100644
> --- a/drivers/mmc/host/sdhci-esdhc.h
> +++ b/drivers/mmc/host/sdhci-esdhc.h
> @@ -19,7 +19,6 @@
>   */
>  
>  #define ESDHC_DEFAULT_QUIRKS	(SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \
> -				SDHCI_QUIRK_BROKEN_CARD_DETECTION | \
>  				SDHCI_QUIRK_NO_BUSY_IRQ | \
>  				SDHCI_QUIRK_NONSTANDARD_CLOCK | \
>  				SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | \
> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
> index fcd0e1f..08161f6 100644
> --- a/drivers/mmc/host/sdhci-of-esdhc.c
> +++ b/drivers/mmc/host/sdhci-of-esdhc.c
> @@ -73,7 +73,8 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
>  }
>  
>  struct sdhci_of_data sdhci_esdhc = {
> -	.quirks = ESDHC_DEFAULT_QUIRKS,
> +	/* card detection could be handled via GPIO */
> +	.quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION,
>  	.ops = {
>  		.read_l = sdhci_be32bs_readl,
>  		.read_w = esdhc_readw,
> -- 
> 1.7.2.3
> 

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110210/398800b4/attachment-0001.sig>