lkml.org 
[lkml]   [2013]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 2/2] mmc: mxs-mmc: add non-removable property
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2013-04-09 18:01    [W:0.049 / U:1.412 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site