mmc: dw_mmc: use the hold register when send stop command
authorJaehoon Chung <jh80.chung@samsung.com>
Thu, 17 Nov 2016 07:40:36 +0000 (16:40 +0900)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 29 Nov 2016 08:05:08 +0000 (09:05 +0100)
If DW_MMC_CARD_NO_USE_HOLD isn't set, it's usesd by default.
Enve if SDMMC_CMD_USB_HOLD_REG is set in prepare_command(), but it
doesn't set in pre_stop_abort().

To maintain the consistency, add the checking condition for this.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/dw_mmc.c

index 7c7cbb763deb508ac1b6c5b04338a4af85a8a350..a7620ff56e8e5b5b7c54ab00c02c0049c7a20b94 100644 (file)
@@ -337,6 +337,9 @@ static u32 dw_mci_prep_stop_abort(struct dw_mci *host, struct mmc_command *cmd)
        cmdr = stop->opcode | SDMMC_CMD_STOP |
                SDMMC_CMD_RESP_CRC | SDMMC_CMD_RESP_EXP;
 
+       if (!test_bit(DW_MMC_CARD_NO_USE_HOLD, &host->cur_slot->flags))
+               cmdr |= SDMMC_CMD_USE_HOLD_REG;
+
        return cmdr;
 }