From patchwork Tue Dec 2 16:47:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 5421321 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4F49FBEEA8 for ; Tue, 2 Dec 2014 16:57:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D5C120225 for ; Tue, 2 Dec 2014 16:57:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 875292011B for ; Tue, 2 Dec 2014 16:57:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932587AbaLBQ5E (ORCPT ); Tue, 2 Dec 2014 11:57:04 -0500 Received: from mail.kmu-office.ch ([178.209.48.109]:60794 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932544AbaLBQ5D (ORCPT ); Tue, 2 Dec 2014 11:57:03 -0500 Received: from trochilidae.toradex.int (unknown [46.140.72.82]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 7EBEB5E3688; Tue, 2 Dec 2014 17:46:58 +0100 (CET) From: Stefan Agner To: chris@printf.net, ulf.hansson@linaro.org, anton@enomsg.org Cc: rmk+kernel@arm.linux.org.uk, b29396@freescale.com, shawn.guo@linaro.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stefan@agner.ch Subject: [PATCH 2/2] mmc: sdhci-esdhc-imx: enable IPG clock for sdio interrupts Date: Tue, 2 Dec 2014 17:47:25 +0100 Message-Id: <1417538845-10867-2-git-send-email-stefan@agner.ch> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1417538845-10867-1-git-send-email-stefan@agner.ch> References: <1417538845-10867-1-git-send-email-stefan@agner.ch> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Enable IPG clock for sdio interrupts while runtime PM, since this clock is needed for register access. The need of this clock has been verified on Vybrid, but this is probably true for i.MX53 and maybe others. The need for bus access during runtime suspend has been introduced with be138554a792 ("mmc: sdhci: allow sdio interrupts while sdhci runtime suspended"). Signed-off-by: Stefan Agner --- drivers/mmc/host/sdhci-esdhc-imx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 587ee0e..b7e9ad1 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1193,10 +1193,10 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) ret = sdhci_runtime_suspend_host(host); - if (!sdhci_sdio_irq_enabled(host)) { + if (!sdhci_sdio_irq_enabled(host)) clk_disable_unprepare(imx_data->clk_per); - clk_disable_unprepare(imx_data->clk_ipg); - } + + clk_disable_unprepare(imx_data->clk_ipg); clk_disable_unprepare(imx_data->clk_ahb); return ret; @@ -1208,10 +1208,10 @@ static int sdhci_esdhc_runtime_resume(struct device *dev) struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = pltfm_host->priv; - if (!sdhci_sdio_irq_enabled(host)) { + if (!sdhci_sdio_irq_enabled(host)) clk_prepare_enable(imx_data->clk_per); - clk_prepare_enable(imx_data->clk_ipg); - } + + clk_prepare_enable(imx_data->clk_ipg); clk_prepare_enable(imx_data->clk_ahb); return sdhci_runtime_resume_host(host);