lkml.org 
[lkml]   [2017]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/9] Revert "mmc: dw_mmc: remove the unnecessary slot variable"
    Date
    This reverts commit e47c0b96678c5fd731c125dca677880e06d6394c.

    The Mellanox BlueField SoC requires multiple slot dw-mmc support.

    Signed-off-by: Liming Sun <lsun@mellanox.com>
    ---
    drivers/mmc/host/dw_mmc.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
    index 860313b..c9f81db 100644
    --- a/drivers/mmc/host/dw_mmc.c
    +++ b/drivers/mmc/host/dw_mmc.c
    @@ -3040,15 +3040,17 @@ static void dw_mci_enable_cd(struct dw_mci *host)
    {
    unsigned long irqflags;
    u32 temp;
    + struct dw_mci_slot *slot;

    /*
    * No need for CD if all slots have a non-error GPIO
    * as well as broken card detection is found.
    */
    - if (host->slot->mmc->caps & MMC_CAP_NEEDS_POLL)
    + slot = host->slot;
    + if (slot->mmc->caps & MMC_CAP_NEEDS_POLL)
    return;

    - if (mmc_gpio_get_cd(host->slot->mmc) < 0) {
    + if (mmc_gpio_get_cd(slot->mmc) < 0) {
    spin_lock_irqsave(&host->irq_lock, irqflags);
    temp = mci_readl(host, INTMASK);
    temp |= SDMMC_INT_CD;
    @@ -3319,6 +3321,7 @@ int dw_mci_runtime_resume(struct device *dev)
    {
    int ret = 0;
    struct dw_mci *host = dev_get_drvdata(dev);
    + struct dw_mci_slot *slot = host->slot;

    if (host->slot &&
    (mmc_can_gpio_cd(host->slot->mmc) ||
    @@ -3358,11 +3361,11 @@ int dw_mci_runtime_resume(struct device *dev)
    mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE);


    - if (host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
    - dw_mci_set_ios(host->slot->mmc, &host->slot->mmc->ios);
    + if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
    + dw_mci_set_ios(slot->mmc, &slot->mmc->ios);

    /* Force setup bus to guarantee available clock output */
    - dw_mci_setup_bus(host->slot, true);
    + dw_mci_setup_bus(slot, true);

    /* Now that slots are all setup, we can enable card detect */
    dw_mci_enable_cd(host);
    --
    1.8.3.1
    \
     
     \ /
      Last update: 2017-10-06 21:23    [W:3.785 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site