diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-05 14:34:49 +0100 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-01-13 12:48:19 -0500 |
| commit | 6c3331d3ace7989688fa59f541f5e722e44ac373 (patch) | |
| tree | 0e511e4f65f503ccef96f4c9ca98a34d629dbf0c /drivers/mmc | |
| parent | a91fe279ae750d67d65039bb4ac2cc6ef51e7a2a (diff) | |
| download | lwn-6c3331d3ace7989688fa59f541f5e722e44ac373.tar.gz lwn-6c3331d3ace7989688fa59f541f5e722e44ac373.zip | |
mmc: mxs: use standard flag for cd inverted
We have a MMC_CAP2_CD_ACTIVE_HIGH flag, so use it rather than a custom
driver specific flag.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 02210ce8025e..3dd2f4c867e6 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -71,7 +71,6 @@ struct mxs_mmc_host { int sdio_irq_en; int wp_gpio; bool wp_inverted; - bool cd_inverted; }; static int mxs_mmc_get_ro(struct mmc_host *mmc) @@ -94,9 +93,15 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) { struct mxs_mmc_host *host = mmc_priv(mmc); struct mxs_ssp *ssp = &host->ssp; + int present; - return !(readl(ssp->base + HW_SSP_STATUS(ssp)) & - BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; + present = !(readl(ssp->base + HW_SSP_STATUS(ssp)) & + BM_SSP_STATUS_CARD_DETECT); + + if (mmc->caps2 & MMC_CAP2_CD_ACTIVE_HIGH) + present = !present; + + return present; } static int mxs_mmc_reset(struct mxs_mmc_host *host) @@ -658,7 +663,8 @@ static int mxs_mmc_probe(struct platform_device *pdev) if (flags & OF_GPIO_ACTIVE_LOW) host->wp_inverted = 1; - host->cd_inverted = of_property_read_bool(np, "cd-inverted"); + if (of_property_read_bool(np, "cd-inverted")) + mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH; mmc->f_min = 400000; mmc->f_max = 288000000; |