aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>2013-09-09 11:01:21 -0700
committerSteve Sakoman <steve@sakoman.com>2015-06-02 14:57:03 -0700
commit234f781f6f98d868e8da036e5486426f1f5c78bc (patch)
tree8dcdc9c0bd6bae236b1260d7a139cabf04acb9bd
parent945a4ed3eaaaff3ae8383f1842a23d7abc0d3afb (diff)
downloadedison-v3.10-234f781f6f98d868e8da036e5486426f1f5c78bc.tar.gz
mmc: Enabled MRFLD SD card enumeration.
Enabled MRFLD SD card enumeration. Signed-off-by: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
-rw-r--r--arch/x86/platform/intel-mid/device_libs/pci/platform_sdhci_pci.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/platform/intel-mid/device_libs/pci/platform_sdhci_pci.c b/arch/x86/platform/intel-mid/device_libs/pci/platform_sdhci_pci.c
index c66933d0221..b8a20f18c65 100644
--- a/arch/x86/platform/intel-mid/device_libs/pci/platform_sdhci_pci.c
+++ b/arch/x86/platform/intel-mid/device_libs/pci/platform_sdhci_pci.c
@@ -439,12 +439,8 @@ static struct sdhci_pci_data *get_sdhci_platform_data(struct pci_dev *pdev)
break;
case 2:
pdata = &mrfl_sdhci_pci_data[SD_INDEX];
- /* REVERTME: disable SD card temporarily for bring up
- * revert this change once GPIO driver is updated
- * with Merrifield specific changes
- * if (intel_mid_identify_sim() ==
+ if (intel_mid_identify_sim() ==
INTEL_MID_CPU_SIMULATION_HVP)
- */
pdata->platform_quirks |=
PLFM_QUIRK_NO_HOST_CTRL_HW;
break;