releases/4.6.1/mmc-sdhci-pci-remove-mmc_cap_bus_width_test-for-intel-controllers.patch

   1 From 822969369482166050c5b2f7013501505e025c39 Mon Sep 17 00:00:00 2001
   2 From: Adrian Hunter <adrian.hunter@intel.com>
   3 Date: Fri, 20 May 2016 10:33:47 +0300
   4 Subject: mmc: sdhci-pci: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
   5
   6 From: Adrian Hunter <adrian.hunter@intel.com>
   7
   8 commit 822969369482166050c5b2f7013501505e025c39 upstream.
   9
  10 The CMD19/CMD14 bus width test has been found to be unreliable in
  11 some cases.  It is not essential, so simply remove it.
  12
  13 Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
  14 Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16
  17 ---
  18  drivers/mmc/host/sdhci-pci-core.c |    5 +----
  19  1 file changed, 1 insertion(+), 4 deletions(-)
  20
  21 --- a/drivers/mmc/host/sdhci-pci-core.c
  22 +++ b/drivers/mmc/host/sdhci-pci-core.c
  23 @@ -361,7 +361,6 @@ static int byt_emmc_probe_slot(struct sd
  24  {
  25         slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
  26                                  MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |
  27 -                                MMC_CAP_BUS_WIDTH_TEST |
  28                                  MMC_CAP_WAIT_WHILE_BUSY;
  29         slot->host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ;
  30         slot->hw_reset = sdhci_pci_int_hw_reset;
  31 @@ -377,15 +376,13 @@ static int byt_emmc_probe_slot(struct sd
  32  static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
  33  {
  34         slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE |
  35 -                                MMC_CAP_BUS_WIDTH_TEST |
  36                                  MMC_CAP_WAIT_WHILE_BUSY;
  37         return 0;
  38  }
  39
  40  static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
  41  {
  42 -       slot->host->mmc->caps |= MMC_CAP_BUS_WIDTH_TEST |
  43 -                                MMC_CAP_WAIT_WHILE_BUSY;
  44 +       slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
  45         slot->cd_con_id = NULL;
  46         slot->cd_idx = 0;
  47         slot->cd_override_level = true;