From 25081442377c11a267c3491fb264eafc530ea1f6 Mon Sep 17 00:00:00 2001 From: Yunpeng Gao Date: Fri, 23 Mar 2012 10:52:41 +0800 Subject: [PATCH] REVERT ME: Define CONFIG_BOARD_MRFLD_HVP BZ: 27386 Merrifield HVP platform only implemented 1 storage host controller - eMMC0. Other 3 storage host controllers are not existed in FPGA at all. So the storage driver needs to know the board type and prevent initialization to the 3 non-existen host controllers if on the HVP board. Actually, the board type macro CONFIG_BOARD_MRFLD_HVP should be defined in arch/x86/Kconfig and enabled in Merrifeld board specific configuration file. But now these changes are not introduced yet. So this patch just set it in mmc driver to make sure the storage driver working on HVP board. Once the macro defined and enabled in board specific configuration file, this patch should be reverted. Change-Id: I40f1aef2bbb6c3336cb64aa7fe2fdc734eec5126 Signed-off-by: Yunpeng Gao Reviewed-on: http://android.intel.com:8080/40287 Reviewed-by: Tang, Richard Tested-by: Sun, Jianhua Reviewed-by: buildbot Tested-by: buildbot --- drivers/mmc/host/sdhci-pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 1adc585..c02b5dd 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -409,6 +409,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mfd_emmc = { .remove_slot = mfd_emmc_remove_slot, }; +#define CONFIG_BOARD_MRFLD_HVP 1 static int intel_mrfl_mmc_probe(struct sdhci_pci_chip *chip) { int ret = 0; -- 2.7.4