From: Hector Palacios <hector.palacios@digi.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: linux-mmc@vger.kernel.org, kernel@pengutronix.de, cjb@laptop.org,
aletes.xgr@gmail.com,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Marek Vasut <marex@denx.de>, Shawn Guo <shawn.guo@linaro.org>
Subject: Re: [PATCH v2 2/2] mmc: mxs-mmc: add non-removable property
Date: Tue, 9 Apr 2013 17:21:29 +0200 [thread overview]
Message-ID: <516431F9.8010302@digi.com> (raw)
In-Reply-To: <51643053.7030302@digi.com>
On 04/09/2013 05:14 PM, Hector Palacios wrote:
> @@ -95,7 +97,8 @@ 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 !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
> + return host->non_removable || host->broken_cd ||
> + !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
> BM_SSP_STATUS_CARD_DETECT);
> }
Sorry, I missed your original XOR here, when merging my changes:
@@ -95,7 +97,8 @@ 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 !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ return host->non_removable || host->broken_cd ||
+ !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
}
static void mxs_mmc_reset(struct mxs_mmc_host *host)
Regards,
--
Héctor Palacios
WARNING: multiple messages have this Message-ID (diff)
From: Hector Palacios <hector.palacios@digi.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: <linux-mmc@vger.kernel.org>, <kernel@pengutronix.de>,
<cjb@laptop.org>, <aletes.xgr@gmail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Marek Vasut <marex@denx.de>, Shawn Guo <shawn.guo@linaro.org>
Subject: Re: [PATCH v2 2/2] mmc: mxs-mmc: add non-removable property
Date: Tue, 9 Apr 2013 17:21:29 +0200 [thread overview]
Message-ID: <516431F9.8010302@digi.com> (raw)
In-Reply-To: <51643053.7030302@digi.com>
On 04/09/2013 05:14 PM, Hector Palacios wrote:
> @@ -95,7 +97,8 @@ 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 !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
> + return host->non_removable || host->broken_cd ||
> + !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
> BM_SSP_STATUS_CARD_DETECT);
> }
Sorry, I missed your original XOR here, when merging my changes:
@@ -95,7 +97,8 @@ 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 !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ return host->non_removable || host->broken_cd ||
+ !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
}
static void mxs_mmc_reset(struct mxs_mmc_host *host)
Regards,
--
Héctor Palacios
next prev parent reply other threads:[~2013-04-09 15:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 12:47 [PATCH v2 0/2] mmc: mxs-mmc: add cd-inverted and non-removeable Marc Kleine-Budde
2013-04-05 12:47 ` [PATCH v2 1/2] mmc: mxs-mmc: add cd-inverted property Marc Kleine-Budde
2013-04-05 12:47 ` [PATCH v2 2/2] mmc: mxs-mmc: add non-removable property Marc Kleine-Budde
2013-04-09 15:14 ` Hector Palacios
2013-04-09 15:14 ` Hector Palacios
2013-04-09 15:21 ` Hector Palacios [this message]
2013-04-09 15:21 ` Hector Palacios
2013-04-09 16:34 ` Marc Kleine-Budde
2013-04-10 8:19 ` Hector Palacios
2013-04-10 9:16 ` Marc Kleine-Budde
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=516431F9.8010302@digi.com \
--to=hector.palacios@digi.com \
--cc=aletes.xgr@gmail.com \
--cc=cjb@laptop.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=marex@denx.de \
--cc=mkl@pengutronix.de \
--cc=shawn.guo@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.