Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82296936 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers 



The CMD19/CMD14 bus width test has been found to be unreliable in
some cases.  It is not essential, so simply remove it.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 32ecd320

drivers/mmc/host/sdhci-pci-core.c

+1 −4
Original line number Diff line number Diff line
@@ -356,7 +356,6 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) 
{

	slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |

				 MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |

				 MMC_CAP_BUS_WIDTH_TEST |

				 MMC_CAP_WAIT_WHILE_BUSY;

	slot->host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ;

	slot->hw_reset = sdhci_pci_int_hw_reset;
@@ -372,15 +371,13 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) 
static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)

{

	slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE |

				 MMC_CAP_BUS_WIDTH_TEST |

				 MMC_CAP_WAIT_WHILE_BUSY;

	return 0;

}



static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)

{

	slot->host->mmc->caps |= MMC_CAP_BUS_WIDTH_TEST |

				 MMC_CAP_WAIT_WHILE_BUSY;

	slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;

	slot->cd_con_id = NULL;

	slot->cd_idx = 0;

	slot->cd_override_level = true;