lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 28/95] mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sascha Hauer <s.hauer@pengutronix.de>

    commit 5b6b0ad6e572b32a641116aaa5f897ffebe31e44 upstream.

    On i.MX53 we have to write a special SDHCI_CMD_ABORTCMD to the
    SDHCI_TRANSFER_MODE register during a MMC_STOP_TRANSMISSION
    command. This works for SD cards. However, with MMC cards
    the MMC_SET_BLOCK_COUNT command is used instead, but this
    needs the same handling. Fix MMC cards by testing for the
    MMC_SET_BLOCK_COUNT command aswell. Tested on a custom i.MX53
    board with a Transcend MMC+ card and eMMC.

    The kernel started used MMC_SET_BLOCK_COUNT in 3.0, so this
    is a regression for these boards introduced in 3.0; it should
    go to 3.0/3.1/3.2-stable.

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci-esdhc-imx.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/mmc/host/sdhci-esdhc-imx.c
    +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
    @@ -269,8 +269,9 @@ static void esdhc_writew_le(struct sdhci
    imx_data->scratchpad = val;
    return;
    case SDHCI_COMMAND:
    - if ((host->cmd->opcode == MMC_STOP_TRANSMISSION)
    - && (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))
    + if ((host->cmd->opcode == MMC_STOP_TRANSMISSION ||
    + host->cmd->opcode == MMC_SET_BLOCK_COUNT) &&
    + (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))
    val |= SDHCI_CMD_ABORTCMD;

    if (is_imx6q_usdhc(imx_data)) {



    \
     
     \ /
      Last update: 2012-03-09 21:27    [W:0.024 / U:180.764 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site