From patchwork Tue Jan 3 06:46:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ziyuan X-Patchwork-Id: 9494487 Return-Path: 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 E330A606A7 for ; Tue, 3 Jan 2017 06:47:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D34F7205AD for ; Tue, 3 Jan 2017 06:47:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C720C2679B; Tue, 3 Jan 2017 06:47:35 +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 628FC205AD for ; Tue, 3 Jan 2017 06:47:35 +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 1cOIsf-0003xO-Fl; Tue, 03 Jan 2017 06:47:33 +0000 Received: from regular1.263xmail.com ([211.150.99.135]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cOIsc-0003qP-OQ for linux-rockchip@lists.infradead.org; Tue, 03 Jan 2017 06:47:32 +0000 Received: from xzy.xu?rock-chips.com (unknown [192.168.167.201]) by regular1.263xmail.com (Postfix) with ESMTP id 16EB81E661; Tue, 3 Jan 2017 14:47:00 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id CA24C3D0; Tue, 3 Jan 2017 14:46:59 +0800 (CST) X-RL-SENDER: xzy.xu@rock-chips.com X-FST-TO: ulf.hansson@linaro.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: xzy.xu@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: xzy.xu@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 25019NR3M65; Tue, 03 Jan 2017 14:47:01 +0800 (CST) From: Ziyuan Xu To: ulf.hansson@linaro.org, jh80.chung@samsung.com, shawn.lin@rock-chips.com Subject: [PATCH] mmc: dw_mmc: update clock after ctrl reset in runtime resume Date: Tue, 3 Jan 2017 14:46:27 +0800 Message-Id: <1483425987-21805-1-git-send-email-xzy.xu@rock-chips.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170102_224731_115896_EB766CEE X-CRM114-Status: UNSURE ( 4.26 ) 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: randy.li@rock-chips.com, Ziyuan Xu , linux-mmc@vger.kernel.org, linux-rockchip@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Immediately after reset, issue the command which sets update_clock_register_only bit, the card clock will restart. MMC_PM_KEEP_POWER is disabled for SD card and eMMC slots, so that they have no chance to invoke dw_mci_setup_bus for update clock behaviour. Let's consummate it. Fixes: e9ed883 ("mmc: dw_mmc: add runtime PM callback") Reported-by: Randy Li Signed-off-by: Ziyuan Xu --- drivers/mmc/host/dw_mmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b44306b..71715b4 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3357,6 +3357,8 @@ int dw_mci_runtime_resume(struct device *dev) if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER) { dw_mci_set_ios(slot->mmc, &slot->mmc->ios); dw_mci_setup_bus(slot, true); + } else { + mci_send_cmd(slot, SDMMC_CMD_UPD_CLK, 0); } }