mmc: host: disable mmcblk0rpmb for MFLD projects

BZ: 35778

mmcblk0rpmb is not used in MFLD projects. Disable it.

Change-Id: I743e1937f86d181526252e21e19b1e55e7826a3f
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Reviewed-on: http://android.intel.com:8080/48221
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: Tang, Richard <richard.tang@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 57da1b5..6cd3cdc 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -338,7 +338,7 @@ static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot)
                gpio = mfd_emmc0_rst_gpio;
                name = "eMMC0_reset";
                slot->host->mmc->caps2 |= MMC_CAP2_INIT_CARD_SYNC |
-                       MMC_CAP2_BOOTPART_NOACC;
+                       MMC_CAP2_BOOTPART_NOACC | MMC_CAP2_RPMBPART_NOACC;
                sdhci_alloc_panic_host(slot->host);
                break;
        case PCI_DEVICE_ID_INTEL_CLV_EMMC0:
@@ -354,12 +354,14 @@ static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot)
                name = "eMMC1_reset";
                slot->host->quirks2 |= SDHCI_QUIRK2_V2_0_SUPPORT_DDR50;
                slot->host->mmc->caps |= MMC_CAP_1_8V_DDR;
-               slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC;
+               slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC |
+                       MMC_CAP2_RPMBPART_NOACC;
                break;
        case PCI_DEVICE_ID_INTEL_MFD_EMMC1:
                gpio = mfd_emmc1_rst_gpio;
                name = "eMMC1_reset";
-               slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC;
+               slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC|
+                       MMC_CAP2_RPMBPART_NOACC;
                break;
        }