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

   1 From 265984b36ce82fec67957d452dd2b22e010611e4 Mon Sep 17 00:00:00 2001
   2 From: Adrian Hunter <adrian.hunter@intel.com>
   3 Date: Fri, 20 May 2016 10:33:48 +0300
   4 Subject: mmc: sdhci-acpi: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
   5
   6 From: Adrian Hunter <adrian.hunter@intel.com>
   7
   8 commit 265984b36ce82fec67957d452dd2b22e010611e4 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-acpi.c |    6 +++---
  19  1 file changed, 3 insertions(+), 3 deletions(-)
  20
  21 --- a/drivers/mmc/host/sdhci-acpi.c
  22 +++ b/drivers/mmc/host/sdhci-acpi.c
  23 @@ -277,7 +277,7 @@ static const struct sdhci_acpi_slot sdhc
  24         .chip    = &sdhci_acpi_chip_int,
  25         .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 | MMC_CAP_WAIT_WHILE_BUSY,
  28 +                  MMC_CAP_WAIT_WHILE_BUSY,
  29         .caps2   = MMC_CAP2_HC_ERASE_SZ,
  30         .flags   = SDHCI_ACPI_RUNTIME_PM,
  31         .quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
  32 @@ -292,7 +292,7 @@ static const struct sdhci_acpi_slot sdhc
  33                    SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
  34         .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
  35         .caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD |
  36 -                  MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY,
  37 +                  MMC_CAP_WAIT_WHILE_BUSY,
  38         .flags   = SDHCI_ACPI_RUNTIME_PM,
  39         .pm_caps = MMC_PM_KEEP_POWER,
  40         .probe_slot     = sdhci_acpi_sdio_probe_slot,
  41 @@ -304,7 +304,7 @@ static const struct sdhci_acpi_slot sdhc
  42         .quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
  43         .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
  44                    SDHCI_QUIRK2_STOP_WITH_TC,
  45 -       .caps    = MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY,
  46 +       .caps    = MMC_CAP_WAIT_WHILE_BUSY,
  47         .probe_slot     = sdhci_acpi_sd_probe_slot,
  48  };
  49