SDMMC: use slot-gpio to handle cd pin

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index de4e50c3e24da80f8d1c262efaedd10576881c62..9d81ce83f7a651d03d161226b84fe84b4cb01daf 100755 (executable)
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -31,12 +31,14 @@
 #include <linux/irq.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
+#include <linux/mmc/sdio.h>
 #include <linux/mmc/rk_mmc.h>
 #include <linux/bitops.h>
 #include <linux/regulator/consumer.h>
 #include <linux/workqueue.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/mmc/slot-gpio.h>
 
 #include "rk_sdmmc.h"
 
@@ -981,20 +983,29 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
        int present;
        struct dw_mci_slot *slot = mmc_priv(mmc);
        struct dw_mci_board *brd = slot->host->pdata;
+       struct dw_mci *host = slot->host;
+       int gpio_cd = mmc_gpio_get_cd(mmc);
 
        /* Use platform get_cd function, else try onboard card detect */
        if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
                present = 1;
        else if (brd->get_cd)
                present = !brd->get_cd(slot->id);
+       else if (!IS_ERR_VALUE(gpio_cd))
+               present = gpio_cd;
        else
                present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
                        == 0 ? 1 : 0;
 
-       if (present)
+       spin_lock_bh(&host->lock);
+       if (present) {
+               set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
                dev_dbg(&mmc->class_dev, "card is present\n");
-       else
+       } else {
+               clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
                dev_dbg(&mmc->class_dev, "card is not present\n");
+       }
+       spin_unlock_bh(&host->lock);
 
        return present;
 }
@@ -1851,10 +1862,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
                        /* Card change detected */
                        slot->last_detect_state = present;
 
-                       /* Mark card as present if applicable */
-                       if (present != 0)
-                               set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-
                        /* Clean up queue if present */
                        mrq = slot->mrq;
                        if (mrq) {
@@ -1903,7 +1910,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
 
                        /* Power down slot */
                        if (present == 0) {
-                               clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
 
                                /*
                                 * Clear down the FIFO - doing so generates a
@@ -2042,6 +2048,26 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot)
 
        return gpio;
 }
+
+/* find the cd gpio for a given slot */
+static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,
+                                       struct mmc_host *mmc)
+{
+       struct device_node *np = dw_mci_of_find_slot_node(dev, slot);
+       int gpio;
+
+       if (!np)
+               return;
+
+       gpio = of_get_named_gpio(np, "cd-gpios", 0);
+
+       /* Having a missing entry is valid; return silently */
+       if (!gpio_is_valid(gpio))
+               return;
+
+       if (mmc_gpio_request_cd(mmc, gpio))
+               dev_warn(dev, "gpio [%d] request failed\n", gpio);
+}
 #else /* CONFIG_OF */
 static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
 {
@@ -2059,6 +2085,11 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot)
 {
        return -EINVAL;
 }
+static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,
+                                       struct mmc_host *mmc)
+{
+       return;
+}
 #endif /* CONFIG_OF */
 
 static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
@@ -2180,12 +2211,8 @@ if (gpio_is_valid(slot->pwr_en_gpio))
                }
        }
 }
-       if (dw_mci_get_cd(mmc))
-               set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-       else
-               clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-
        slot->wp_gpio = dw_mci_of_get_wp_gpio(host->dev, slot->id);
+       dw_mci_of_get_cd_gpio(host->dev, slot->id, mmc);
 
        ret = mmc_add_host(mmc);
        if (ret)
@@ -2348,6 +2375,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
        if (of_find_property(np, "caps2-mmc-hs200-1_2v", NULL))
                pdata->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
 
+       if (of_get_property(np, "cd-inverted", NULL))
+               pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
 
        return pdata;
 }