diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-04-10 11:13:43 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-04-12 14:17:38 -0400 |
| commit | 4c0c9be05004d1eb674b7586216b3d93cc04531c (patch) | |
| tree | 4b1ee4ccf70914c987ce60483d3e06c253514216 /drivers/mmc | |
| parent | 3bffb800b91bb128b61d83deb01ce63c455d108f (diff) | |
| download | linux-3.10-4c0c9be05004d1eb674b7586216b3d93cc04531c.tar.gz linux-3.10-4c0c9be05004d1eb674b7586216b3d93cc04531c.tar.bz2 linux-3.10-4c0c9be05004d1eb674b7586216b3d93cc04531c.zip | |
mmc: mxs-mmc: add cd-inverted property
The card-detect GPIO is inverted on some boards. Handle such case.
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 4efe3021b21..0cdf1f6f3f4 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -72,6 +72,7 @@ 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) @@ -96,7 +97,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) struct mxs_ssp *ssp = &host->ssp; return !(readl(ssp->base + HW_SSP_STATUS(ssp)) & - BM_SSP_STATUS_CARD_DETECT); + BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted; } static void mxs_mmc_reset(struct mxs_mmc_host *host) @@ -691,6 +692,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"); + mmc->f_min = 400000; mmc->f_max = 288000000; mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; |