From patchwork Fri Nov 11 01:10:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5052 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 51C0323E01 for ; Fri, 11 Nov 2011 01:12:07 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4689CA18310 for ; Fri, 11 Nov 2011 01:12:07 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so5072572faa.11 for ; Thu, 10 Nov 2011 17:12:07 -0800 (PST) Received: by 10.152.135.179 with SMTP id pt19mr5660970lab.47.1320973927129; Thu, 10 Nov 2011 17:12:07 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.40.7 with SMTP id t7cs30862lak; Thu, 10 Nov 2011 17:12:07 -0800 (PST) Received: by 10.180.3.33 with SMTP id 1mr11646342wiz.54.1320973926688; Thu, 10 Nov 2011 17:12:06 -0800 (PST) Received: from AM1EHSOBE003.bigfish.com (mail-am1.bigfish.com. [213.199.180.138]) by mx.google.com with ESMTPS id w9si5635443weq.94.2011.11.10.17.12.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Nov 2011 17:12:06 -0800 (PST) Received-SPF: neutral (google.com: 213.199.180.138 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=213.199.180.138; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.180.138 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail13-am1-R.bigfish.com (10.3.201.251) by AM1EHSOBE003.bigfish.com (10.3.204.23) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Nov 2011 01:11:40 +0000 Received: from mail13-am1 (localhost [127.0.0.1]) by mail13-am1-R.bigfish.com (Postfix) with ESMTP id 632D0640251; Fri, 11 Nov 2011 01:12:03 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-SS: 13, X-FB-DOMAIN-IP-MATCH: fail Received: from mail13-am1 (localhost.localdomain [127.0.0.1]) by mail13-am1 (MessageSwitch) id 1320973923227144_30275; Fri, 11 Nov 2011 01:12:03 +0000 (UTC) Received: from AM1EHSMHS005.bigfish.com (unknown [10.3.201.247]) by mail13-am1.bigfish.com (Postfix) with ESMTP id 302FD5A0043; Fri, 11 Nov 2011 01:12:03 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS005.bigfish.com (10.3.207.105) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 11 Nov 2011 01:11:38 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.339.2; Thu, 10 Nov 2011 19:12:02 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAB1B4bW016594; Thu, 10 Nov 2011 19:11:59 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , Richard Zhao Subject: [PATCH V2 14/14] mmc: sdhci-esdhc-imx: add clk_prepare/clk_unprepare Date: Fri, 11 Nov 2011 09:10:29 +0800 Message-ID: <1320973829-4388-15-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> References: <1320973829-4388-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Signed-off-by: Richard Zhao --- drivers/mmc/host/sdhci-esdhc-imx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ae57769..f1ae37e 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -462,7 +462,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) err = PTR_ERR(clk); goto err_clk_get; } - clk_enable(clk); + clk_prepare_enable(clk); pltfm_host->clk = clk; if (!is_imx25_esdhc(imx_data)) @@ -550,7 +550,7 @@ no_card_detect_irq: gpio_free(boarddata->wp_gpio); no_card_detect_pin: no_board_data: - clk_disable(pltfm_host->clk); + clk_disable_unprepare(pltfm_host->clk); clk_put(pltfm_host->clk); err_clk_get: kfree(imx_data); @@ -577,7 +577,7 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) gpio_free(boarddata->cd_gpio); } - clk_disable(pltfm_host->clk); + clk_disable_unprepare(pltfm_host->clk); clk_put(pltfm_host->clk); kfree(imx_data);