Message ID | 20161103062135.10697-5-jh80.chung@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 68B4B60573 for <patchwork-linux-rockchip@patchwork.kernel.org>; Thu, 3 Nov 2016 06:23:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5ADAA2A4DE for <patchwork-linux-rockchip@patchwork.kernel.org>; Thu, 3 Nov 2016 06:23:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EFE52A4FF; Thu, 3 Nov 2016 06:23:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1B8A02A4DE for <patchwork-linux-rockchip@patchwork.kernel.org>; Thu, 3 Nov 2016 06:23:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2BRJ-0004qU-2p; Thu, 03 Nov 2016 06:23:53 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2BPg-0003FB-UN; Thu, 03 Nov 2016 06:22:15 +0000 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OG101AYWYZOI240@mailout2.samsung.com>; Thu, 03 Nov 2016 15:21:46 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-c6-581ad77a5f73 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 57.8B.25310.A77DA185; Thu, 3 Nov 2016 15:21:46 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OG100J7YZ02LAA0@mmp1.samsung.com>; Thu, 03 Nov 2016 15:21:46 +0900 (KST) From: Jaehoon Chung <jh80.chung@samsung.com> To: linux-mmc@vger.kernel.org Subject: [PATCH 04/13] mmc: dw_mmc: use the hold register when send stop command Date: Thu, 03 Nov 2016 15:21:26 +0900 Message-id: <20161103062135.10697-5-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.1 In-reply-to: <20161103062135.10697-1-jh80.chung@samsung.com> References: <20161103062135.10697-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42I5/e+xgG7VdakIg3XdChbzj5xjtfj/6DWr xY1fbawW589vYLfY9Pgaq8XlXXPYLI7872e0+PTgP7PFjPP7mCxa9x5ht7jzZD2rxfG14Q48 HptWdbJ53Lm2h81j85J6j7+z9rN49G1Zxeix/do8Zo/Pm+QC2KPcbDJSE1NSixRS85LzUzLz 0m2VQkPcdC2UFPISc1NtlSJ0fUOClBTKEnNKgTwjAzTg4BzgHqykb5fglnHoZT9LwWO2imcn ZjI2MN5g7WLk5JAQMJFYvukkI4QtJnHh3nq2LkYuDiGBpYwS/3avY4ZwfjBK7Hp7kxmkik1A R2L7t+NMILaIgKzEzz8XwDqYBQ4ySfyftJuli5GDQ1ggQGJOTzlIDYuAqsSP5d/B6nkFrCVe 7VnPDLFNXuLC1VMsIDangI3ExCPNYBcJAdXcOrySaQIj7wJGhlWMEqkFyQXFSem5hnmp5XrF ibnFpXnpesn5uZsYwXHxTGoH48Fd7ocYBTgYlXh4P6hIRQixJpYVV+YeYpTgYFYS4d11BSjE m5JYWZValB9fVJqTWnyI0RTosInMUqLJ+cCYzSuJNzQxNzE3NrAwt7Q0MVIS522c/SxcSCA9 sSQ1OzW1ILUIpo+Jg1OqgdFsXhT37PIlXgva+5YopO1Yr/s+7kvdrdNOOYbifAp7KhdOe7Mo b+PmA7s6reW2hsy+uEFi1oPXvnX/L1VIthY9FYics1LKJru/TrH+aF29nvHflvxHL2v3Pi1U Ni57IX9IOXHfzI2JWf7RT098ut2Tcd5Ujp3l7Pn4Xd3d0neubHtWv8fvo6USS3FGoqEWc1Fx IgA5OhNwoQIAAA== X-MTR: 20000000000000000@CPGS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161102_232213_341457_37DFCB0C X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms <linux-rockchip.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>, <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/> List-Post: <mailto:linux-rockchip@lists.infradead.org> List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>, <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe> Cc: devicetree@vger.kernel.org, ulf.hansson@linaro.org, linux-samsung-soc@vger.kernel.org, heiko@sntech.de, shawn.lin@rock-chips.com, linux-kernel@vger.kernel.org, krzk@kernel.org, Jaehoon Chung <jh80.chung@samsung.com>, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org> Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 6ccb817..23fc505 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -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; }
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> --- drivers/mmc/host/dw_mmc.c | 3 +++ 1 file changed, 3 insertions(+)