diff options
| author | Hector Palacios <hector.palacios@digi.com> | 2013-04-10 11:13:45 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-04-12 20:17:55 +0200 |
| commit | 1d53196a0d604fcf636203fac21e944b6a9cf275 (patch) | |
| tree | 280c73673e05c91965564bb4b693c1d063b7bf68 | |
| parent | mmc: mxs-mmc: add non-removable property (diff) | |
| download | linux-1d53196a0d604fcf636203fac21e944b6a9cf275.tar.xz linux-1d53196a0d604fcf636203fac21e944b6a9cf275.zip | |
mmc: mxs-mmc: add broken-cd property
According to bindings documentation for mmc, the property 'broken-cd'
can be used to indicate card-detection is not available and polling
must be used instead. This patch retrieves this property
and sets a custom flag. On the get_cd() hook, it returns 1 if
the flag is set, to always assume the card is present.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index c23188129314..146a53bfab71 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -73,6 +73,7 @@ struct mxs_mmc_host { int wp_gpio; bool wp_inverted; bool cd_inverted; + bool broken_cd; bool non_removable; }; @@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) struct mxs_mmc_host *host = mmc_priv(mmc); struct mxs_ssp *ssp = &host->ssp; - return host->non_removable || + return host->non_removable || host->broken_cd || !(readl(ssp->base + HW_SSP_STATUS(ssp)) & BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; } @@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) mmc->caps |= MMC_CAP_4_BIT_DATA; else if (bus_width == 8) mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; + host->broken_cd = of_property_read_bool(np, "broken-cd"); host->non_removable = of_property_read_bool(np, "non-removable"); if (host->non_removable) mmc->caps |= MMC_CAP_NONREMOVABLE; |