From patchwork Wed Nov 19 18:51:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5340331 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1B8209F1E1 for ; Wed, 19 Nov 2014 18:52:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4100E201C8 for ; Wed, 19 Nov 2014 18:52:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5567520176 for ; Wed, 19 Nov 2014 18:52:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrAMB-00012G-RX; Wed, 19 Nov 2014 18:51:59 +0000 Received: from mail-ie0-x22e.google.com ([2607:f8b0:4001:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrAMA-0000wM-0e for linux-rockchip@lists.infradead.org; Wed, 19 Nov 2014 18:51:58 +0000 Received: by mail-ie0-f174.google.com with SMTP id rl12so1087311iec.5 for ; Wed, 19 Nov 2014 10:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=7y//tOypwOaF2/Fax8+MHrpFe0k2sGofR881BG1bE9I=; b=hBltlpuT3z8puFq5GlHTh81XXCHBpYgyljsh9og10kN/vGIkW07UBVGYuMafd6go/f jz5uSbvA91Qvs3cl8mEKBTlHY4jG9FKCvnSEWBkBknAiJCfP5i6awEiE+oSst2EXSyDQ O7TuzLGpm4JGySB1eZUltyGE7yf3uXACQmth8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7y//tOypwOaF2/Fax8+MHrpFe0k2sGofR881BG1bE9I=; b=eaQb1e1CGeGDhsBFdZlk+OLbK3c3mPRoe8texEA99OsttPKpBjq1NUO8GjUs4Wm6b2 4WIqmslgo9mJX/RuhhqRZ9uJ9QcDjzSyoRFdDCpxgiBxku1N9+14QChvlSQIJTHdqkQo NmAbZ8qiDGsbGaoaz+ESLIwx17quHT3rnz4MUHdfKkLGi241R7++aZt2YCUn/0hEKw6v //AKGgpm2ME3fw3SqkE8QyL3kmKiVfyZpjl/UxtmPKlMM6RS6C8g/HYRBu9cdTJF3Bwu W+uHR/bnSwEKNRedofDm+BpU1Y1BO3ofj38Ch4YbHNevt5FpivncBZdyILZk0YmOv3ii VPLA== X-Gm-Message-State: ALoCoQmknGDTYFHDKRyy54k4J5D4xkhVoR1n483LG9UAzJedPOSrwrVUUhaxUKflJgKFg9jpdfT3 X-Received: by 10.107.165.19 with SMTP id o19mr46205052ioe.1.1416423095653; Wed, 19 Nov 2014 10:51:35 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id d1sm303108igz.13.2014.11.19.10.51.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Nov 2014 10:51:35 -0800 (PST) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Subject: [PATCH] mmc: dw_mmc: Turn the card clock off at suspend time Date: Wed, 19 Nov 2014 10:51:13 -0800 Message-Id: <1416423073-8105-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141119_105158_095622_3F661E7F X-CRM114-Status: GOOD ( 11.65 ) X-Spam-Score: -0.8 (/) Cc: Heiko Stuebner , Andrew Bresticker , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Doug Anderson , chris@printf.net, linux-rockchip@lists.infradead.org, Alim Akhtar , Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the dw_mmc driver was first added to Linux it's had a TODO in it that we should turn off the card clock during suspend. I have no idea for sure why it wasn't done originally, but if I had to guess I'd guess it was related to the lack of a common clock framework. Let's do it now. There is no reason for the card clock to be left on during suspend and most systems will eventually turn it off anyway (when whole clock trees are disabled). However, it's good to be explicit that it's disabled at the time that the MMC subsystem is disabled. This actually fixes a bug on Rockchip rk3288 where an SDIO card wakes the system back up during suspend. Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 5a37c33..c448159 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2825,11 +2825,10 @@ EXPORT_SYMBOL(dw_mci_remove); #ifdef CONFIG_PM_SLEEP -/* - * TODO: we should probably disable the clock to the card in the suspend path. - */ int dw_mci_suspend(struct dw_mci *host) { + clk_disable(host->ciu_clk); + return 0; } EXPORT_SYMBOL(dw_mci_suspend); @@ -2838,6 +2837,8 @@ int dw_mci_resume(struct dw_mci *host) { int i, ret; + clk_enable(host->ciu_clk); + if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) { ret = -ENODEV; return ret;