mmc: mxs: use standard flag for cd inverted

We have a MMC_CAP2_CD_ACTIVE_HIGH flag, so use it rather than a custom
driver specific flag.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 02210ce8025e34fcc3e73be996449219219a0a76..3dd2f4c867e60cf3e1b7c5203956ad3cf2ae2329 100644 (file)
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -71,7 +71,6 @@ 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)
@@ -94,9 +93,15 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
 {
        struct mxs_mmc_host *host = mmc_priv(mmc);
        struct mxs_ssp *ssp = &host->ssp;
+       int present;
 
-       return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
-                 BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
+       present = !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+                       BM_SSP_STATUS_CARD_DETECT);
+
+       if (mmc->caps2 & MMC_CAP2_CD_ACTIVE_HIGH)
+               present = !present;
+
+       return present;
 }
 
 static int mxs_mmc_reset(struct mxs_mmc_host *host)
@@ -658,7 +663,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");
+       if (of_property_read_bool(np, "cd-inverted"))
+               mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
 
        mmc->f_min = 400000;
        mmc->f_max = 288000000;