mmc: sdhci: ignore CLV card detection support

BZ: 16895

CLV has different memery map with MFLD which can cause fabric error
if using the same rule with MFLD. And currently CLV didn't have runtime
pm, so we can disable SD gpio detection temporary for CLV

Change-Id: I10805f5338a232aa290e7f44ecaaed2a34ff44cb
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Reviewed-on: http://android.intel.com:8080/26658
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Mai, Leonard <leonard.mai@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 6a01e92..7095fc4 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -256,6 +256,9 @@ static int mfd_sd_probe_slot(struct sdhci_pci_slot *slot)
 {
        int err, irq, gpio = MFLD_SD_CD_PIN;
 
+       if (slot->chip->pdev->device != PCI_DEVICE_ID_INTEL_MFD_SD)
+               return 0;
+
        slot->cd_gpio = -EINVAL;
        slot->cd_irq = -EINVAL;
 
@@ -308,6 +311,9 @@ out:
 
 static void mfd_sd_remove_slot(struct sdhci_pci_slot *slot, int dead)
 {
+       if (slot->chip->pdev->device != PCI_DEVICE_ID_INTEL_MFD_SD)
+               return;
+
        if (slot->cd_irq >= 0)
                free_irq(slot->cd_irq, slot);
        gpio_free(slot->cd_gpio);