Merge tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / drivers / mmc / host / mxs-mmc.c

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 4fdc71113e6d1747fa6b762d33db50daf07f55f5..4278a1787d086a22d671e492e26e1294ef688a9d 100644 (file)
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -72,6 +72,9 @@ struct mxs_mmc_host {
        int                             sdio_irq_en;
        int                             wp_gpio;
        bool                            wp_inverted;
+       bool                            cd_inverted;
+       bool                            broken_cd;
+       bool                            non_removable;
 };
 
 static int mxs_mmc_get_ro(struct mmc_host *mmc)
@@ -95,8 +98,9 @@ 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)) &
-                BM_SSP_STATUS_CARD_DETECT);
+       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)
@@ -648,11 +652,16 @@ static int mxs_mmc_probe(struct platform_device *pdev)
                mmc->caps |= MMC_CAP_4_BIT_DATA;
        else if (bus_width == 8)
                mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
+       host->broken_cd = of_property_read_bool(np, "broken-cd");
+       host->non_removable = of_property_read_bool(np, "non-removable");
+       if (host->non_removable)
+               mmc->caps |= MMC_CAP_NONREMOVABLE;
        host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
-
        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;