From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-mmc@vger.kernel.org
Cc: kernel@pengutronix.de, cjb@laptop.org,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v3 1/3] mmc: mxs-mmc: add cd-inverted property
Date: Wed, 10 Apr 2013 11:13:43 +0200 [thread overview]
Message-ID: <1365585225-11360-2-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1365585225-11360-1-git-send-email-mkl@pengutronix.de>
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>
---
drivers/mmc/host/mxs-mmc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 4efe302..0cdf1f6 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;
--
1.8.2.rc2
next prev parent reply other threads:[~2013-04-10 9:14 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 ` Marc Kleine-Budde [this message]
2013-04-10 9:13 ` [PATCH v3 2/3] mmc: mxs-mmc: add non-removable property Marc Kleine-Budde
2013-04-10 9:13 ` [PATCH v3 3/3] mmc: mxs-mmc: add broken-cd property Marc Kleine-Budde
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-2-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=cjb@laptop.org \
--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