lkml.org 
[lkml]   [2016]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 133/206] mmc: sdhci-pci: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
    Date
    4.2.8-ckt12 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 822969369482166050c5b2f7013501505e025c39 upstream.

    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: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    [ kamal: backport to 4.2-stable: files moved ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/mmc/host/sdhci-pci.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
    index 5d2e222..2580f02 100644
    --- a/drivers/mmc/host/sdhci-pci.c
    +++ b/drivers/mmc/host/sdhci-pci.c
    @@ -334,7 +334,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;
    @@ -350,15 +349,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;
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-06-10 00:21    [W:4.130 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site