On 04/10/2013 10:19 AM, Hector Palacios wrote: > On Tue 09 Apr 2013 06:34:10 PM CEST, Marc Kleine-Budde wrote: >> On 04/09/2013 05:21 PM, Hector Palacios wrote: >>> 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: >> >> Can you send an incremental patch against my 2/2 with your >> Signed-off-by, I'll squash your patch into mine and repost the series. > > Sure. Here it is: > > From 18f6199947bc2681d2d63b307506019535018646 Mon Sep 17 00:00:00 2001 > From: Hector Palacios <hector.palacios@xxxxxxxx> > Date: Wed, 10 Apr 2013 09:16:31 +0200 > Subject: [PATCH] mmc: mxs-mmc: handle '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@xxxxxxxx> Thanks, your patch description is so good, I'll keep your patch as 3 and repost the whole series. Marc P.S.: -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
