From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-mmc@vger.kernel.org
Cc: kernel@pengutronix.de, cjb@laptop.org,
Hector Palacios <hector.palacios@digi.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v3 3/3] mmc: mxs-mmc: add broken-cd property
Date: Wed, 10 Apr 2013 11:13:45 +0200 [thread overview]
Message-ID: <1365585225-11360-4-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1365585225-11360-1-git-send-email-mkl@pengutronix.de>
From: Hector Palacios <hector.palacios@digi.com>
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>
---
drivers/mmc/host/mxs-mmc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index c231881..146a53b 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;
--
1.8.2.rc2
next prev parent reply other threads:[~2013-04-10 9:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-10 9:13 [PATCH v3 1/3] mmc: mxs-mmc: add cd-inverted, non-removable and broken-cd Marc Kleine-Budde
2013-04-10 9:13 ` [PATCH v3 1/3] mmc: mxs-mmc: add cd-inverted property Marc Kleine-Budde
2013-04-10 9:13 ` [PATCH v3 2/3] mmc: mxs-mmc: add non-removable property Marc Kleine-Budde
2013-04-10 9:13 ` Marc Kleine-Budde [this message]
2013-04-12 14:12 ` [PATCH v3 0/3] mmc: mxs-mmc: add cd-inverted, non-removable and broken-cd Marc Kleine-Budde
2013-04-12 18:18 ` [PATCH v3 1/3] " Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1365585225-11360-4-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=cjb@laptop.org \
--cc=hector.palacios@digi.com \
--cc=kernel@pengutronix.de \
--cc=linux-mmc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox