diff options
author | Hector Palacios <hector.palacios@digi.com> | 2013-04-10 05:13:45 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-04-12 14:17:55 -0400 |
commit | 1d53196a0d604fcf636203fac21e944b6a9cf275 (patch) | |
tree | 280c73673e05c91965564bb4b693c1d063b7bf68 | |
parent | 5086e5f41fd107539911edf62f2d202753ed1980 (diff) |
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 { | |||
73 | int wp_gpio; | 73 | int wp_gpio; |
74 | bool wp_inverted; | 74 | bool wp_inverted; |
75 | bool cd_inverted; | 75 | bool cd_inverted; |
76 | bool broken_cd; | ||
76 | bool non_removable; | 77 | bool non_removable; |
77 | }; | 78 | }; |
78 | 79 | ||
@@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) | |||
97 | struct mxs_mmc_host *host = mmc_priv(mmc); | 98 | struct mxs_mmc_host *host = mmc_priv(mmc); |
98 | struct mxs_ssp *ssp = &host->ssp; | 99 | struct mxs_ssp *ssp = &host->ssp; |
99 | 100 | ||
100 | return host->non_removable || | 101 | return host->non_removable || host->broken_cd || |
101 | !(readl(ssp->base + HW_SSP_STATUS(ssp)) & | 102 | !(readl(ssp->base + HW_SSP_STATUS(ssp)) & |
102 | BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; | 103 | BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; |
103 | } | 104 | } |
@@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) | |||
689 | mmc->caps |= MMC_CAP_4_BIT_DATA; | 690 | mmc->caps |= MMC_CAP_4_BIT_DATA; |
690 | else if (bus_width == 8) | 691 | else if (bus_width == 8) |
691 | mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; | 692 | mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; |
693 | host->broken_cd = of_property_read_bool(np, "broken-cd"); | ||
692 | host->non_removable = of_property_read_bool(np, "non-removable"); | 694 | host->non_removable = of_property_read_bool(np, "non-removable"); |
693 | if (host->non_removable) | 695 | if (host->non_removable) |
694 | mmc->caps |= MMC_CAP_NONREMOVABLE; | 696 | mmc->caps |= MMC_CAP_NONREMOVABLE; |