Hi Jerry,
On 12/6/2011 5:15 PM, r66093@xxxxxxxxxxxxx wrote:
> From: Jerry Huang <Chang-Ming.Huang@xxxxxxxxxxxxx>
>
> Add callback function sdhci_get_cd to detect the card.
> And one new callback added to implement the card detect in sdhci struncture.
> If special platform has the card detect callback, it will return the card
> state, the value zero is for absent cardi and one is for present card.
> If the controller don't support card detect, sdhci_get_cd will return -ENOSYS.
>
> Signed-off-by: Jerry Huang <Chang-Ming.Huang@xxxxxxxxxxxxx>
> CC: Chris Ball <cjb@xxxxxxxxxx>
> ---
> changes for v2:
> - when controller don't support get_cd, return -ENOSYS
> - add new callback for sdhci to detect the card
> - add the CC
>
> drivers/mmc/host/sdhci.c | 21 +++++++++++++++++++++
> drivers/mmc/host/sdhci.h | 2 ++
> 2 files changed, 23 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 6d8eea3..2196c5e 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2,6 +2,7 @@
> * linux/drivers/mmc/host/sdhci.c - Secure Digital Host Controller Interface driver
> *
> * Copyright (C) 2005-2008 Pierre Ossman, All Rights Reserved.
> + * Copyright (C) 2011 Freescale Semiconductor Inc.
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
> @@ -1518,6 +1519,25 @@ static int sdhci_get_ro(struct mmc_host *mmc)
> return ret;
> }
>
> +/* Return values for the sdjco_get_cd callback:
> + * 0 for a absent card
> + * 1 for a present card
> + * -ENOSYS when not supported (equal to NULL callback)
> + */
> +static int sdhci_get_cd(struct mmc_host *mmc)
> +{
> + struct sdhci_host *host = mmc_priv(mmc);
> + unsigned long flags;
> + int present = -ENOSYS;
> +
> + spin_lock_irqsave(&host->lock, flags);
> + if (host->ops->get_cd)
> + present = host->ops->get_cd(host);
> + spin_unlock_irqrestore(&host->lock, flags);
Maybe only use spin-lock if get_cd is defined?
> +
> + return present;
> +}
> +
> static void sdhci_enable_sdio_irq_nolock(struct sdhci_host *host, int enable)
> {
> if (host->flags & SDHCI_DEVICE_DEAD)
> @@ -1884,6 +1904,7 @@ static const struct mmc_host_ops sdhci_ops = {
> .request = sdhci_request,
> .set_ios = sdhci_set_ios,
> .get_ro = sdhci_get_ro,
> + .get_cd = sdhci_get_cd,
> .hw_reset = sdhci_hw_reset,
> .enable_sdio_irq = sdhci_enable_sdio_irq,
> .start_signal_voltage_switch = sdhci_start_signal_voltage_switch,
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 0a5b654..82f4d27 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -69,6 +69,7 @@
> #define SDHCI_SPACE_AVAILABLE 0x00000400
> #define SDHCI_DATA_AVAILABLE 0x00000800
> #define SDHCI_CARD_PRESENT 0x00010000
> +#define SDHCI_CARD_CDPL 0x00040000
> #define SDHCI_WRITE_PROTECT 0x00080000
> #define SDHCI_DATA_LVL_MASK 0x00F00000
> #define SDHCI_DATA_LVL_SHIFT 20
> @@ -261,6 +262,7 @@ struct sdhci_ops {
>
> void (*set_clock)(struct sdhci_host *host, unsigned int clock);
>
> + int (*get_cd)(struct sdhci_host *host);
> int (*enable_dma)(struct sdhci_host *host);
> unsigned int (*get_max_clock)(struct sdhci_host *host);
> unsigned int (*get_min_clock)(struct sdhci_host *host);
--
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
