From patchwork Mon Sep 17 18:16:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 11466 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 4A50223F9E for ; Mon, 17 Sep 2012 17:56:50 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9CAEB3D08B91 for ; Mon, 17 Sep 2012 17:56:49 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so9550081iea.11 for ; Mon, 17 Sep 2012 10:56:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-brightmail-tracker:x-gm-message-state; bh=uliWuAQ6P8YsWJuD2wIKYSCqdSkn54d+X/an8ols9xM=; b=Docbo04T3WbkS8FB/D/wT6ke0m98hzVy9xe55mPJVEo+R9jUcEl76F6pt7JU0s+eNO oXtjcGPcQ+Pu+Nl2wP/6ur9r9rPdTPu94p+hQW9V5OznJVHxw08MrI7B5KvVg6+l4gmP 7ZLDA/EvwNfm834+CDJ7tpI/4q5vsuow0lb3wAUAMYRro0FpRnCiXZTC+HHm6zHJAPFX qRd2IZsoPTgLhRXK4bQgILIlwp/7grBS28PiMPQ28GGcuTrCqi9E5JBWISvFiP6yEejh LCA93YQKXpGy4AuL7HZgTIMKN035eCWqAmTbDirHfkfdL07fI6RFTIAXH7VfhCiY/KLw zpEw== Received: by 10.42.109.194 with SMTP id m2mr9508360icp.48.1347904609364; Mon, 17 Sep 2012 10:56:49 -0700 (PDT) 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.50.184.232 with SMTP id ex8csp329891igc; Mon, 17 Sep 2012 10:56:48 -0700 (PDT) Received: by 10.68.213.138 with SMTP id ns10mr23569116pbc.157.1347904608571; Mon, 17 Sep 2012 10:56:48 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id gk6si16494937pbc.125.2012.09.17.10.56.48; Mon, 17 Sep 2012 10:56:48 -0700 (PDT) Received-SPF: neutral (google.com: 203.254.224.33 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.33; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.33 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAI005339UEK530@mailout3.samsung.com>; Tue, 18 Sep 2012 02:56:47 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-e2-5057645f04fc Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id EE.5A.03860.F5467505; Tue, 18 Sep 2012 02:56:47 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAI00MTJ9U8PO50@mmp1.samsung.com>; Tue, 18 Sep 2012 02:56:47 +0900 (KST) From: Thomas Abraham To: linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: will.newton@imgtec.com, cjb@laptop.org, grant.likely@secretlab.ca, rob.herring@calxeda.com, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, girish.shivananjappa@linaro.org, jh80.chung@samsung.com, tgih.jun@samsung.com, patches@linaro.org Subject: [PATCH v6 4/9] mmc: dw_mmc: lookup for optional biu and ciu clocks Date: Mon, 17 Sep 2012 23:46:38 +0530 Message-id: <1347905803-22742-5-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1347905803-22742-1-git-send-email-thomas.abraham@linaro.org> References: <1347905803-22742-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBJMWRmVeSWpSXmKPExsVy+t9jAd34lPAAg29HpCy+fD3BZjHl8BcW ByaPO9f2sAUwRnHZpKTmZJalFunbJXBlXJv0krngjnRF262jTA2Md8W6GDk5JARMJFZ8ecgG YYtJXLi3Hsjm4hASWMQosba1lx3CaWOSaFt/ghGkik3AQOLRwnfsILaIgJPEkrkTmEGKmAUa mSQ2LtwJNkpYwFvixL3NYA0sAqoS0w+cBbI5OHgFPCUWv4mD2KYksaH3KBOIzSngJTF9+yGw mUJAJXtXzGaZwMi7gJFhFaNoakFyQXFSeq6RXnFibnFpXrpecn7uJkaw/59J72Bc1WBxiFGA g1GJhzchKDxAiDWxrLgy9xCjBAezkgjvbQGgEG9KYmVValF+fFFpTmrxIUZpDhYlcV7hT4EB QgLpiSWp2ampBalFMFkmDk6pBsagE3nrl4adEbR9dfTGOQ6LaY9+3zq7u2P/a4WgXbtkLqVY BkYZyET92HrXLev1jviVkw6fDe//IaFybo1UknOYy9NzZ/ec/Z1RUSM9685U6WUXIp6xnft7 XVs647l57BWTtO3MdfvLZ8akbHEVSTZ4y/nOQtpLJ+bcMz+fqV5fzJ9IC739HMOlxFKckWio xVxUnAgAPh4bL/sBAAA= X-Gm-Message-State: ALoCoQnTIA60OahGmI42oyi/Knc//r2K8Mkl2bZOiucVDn6186o2Xr481GLgO8FjDZuxn4bw6Fq3 Some platforms allow for clock gating and control of bus interface unit clock and card interface unit clock. Add support for clock lookup of optional biu and ciu clocks for clock gating and clock speed determination. Signed-off-by: Abhilash Kesavan Signed-off-by: Thomas Abraham Acked-by: Will Newton --- drivers/mmc/host/dw_mmc.c | 52 +++++++++++++++++++++++++++++++++++++++++-- include/linux/mmc/dw_mmc.h | 4 +++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 227c42e..de45ad2 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1960,13 +1960,42 @@ int dw_mci_probe(struct dw_mci *host) return -ENODEV; } - if (!host->pdata->bus_hz) { + host->biu_clk = clk_get(host->dev, "biu"); + if (IS_ERR(host->biu_clk)) { + dev_dbg(host->dev, "biu clock not available\n"); + } else { + ret = clk_prepare_enable(host->biu_clk); + if (ret) { + dev_err(host->dev, "failed to enable biu clock\n"); + clk_put(host->biu_clk); + return ret; + } + } + + host->ciu_clk = clk_get(host->dev, "ciu"); + if (IS_ERR(host->ciu_clk)) { + dev_dbg(host->dev, "ciu clock not available\n"); + } else { + ret = clk_prepare_enable(host->ciu_clk); + if (ret) { + dev_err(host->dev, "failed to enable ciu clock\n"); + clk_put(host->ciu_clk); + goto err_clk_biu; + } + } + + if (IS_ERR(host->ciu_clk)) + host->bus_hz = host->pdata->bus_hz; + else + host->bus_hz = clk_get_rate(host->ciu_clk); + + if (!host->bus_hz) { dev_err(host->dev, "Platform data must supply bus speed\n"); - return -ENODEV; + ret = -ENODEV; + goto err_clk_ciu; } - host->bus_hz = host->pdata->bus_hz; host->quirks = host->pdata->quirks; spin_lock_init(&host->lock); @@ -2116,6 +2145,17 @@ err_dmaunmap: regulator_disable(host->vmmc); regulator_put(host->vmmc); } + +err_clk_ciu: + if (!IS_ERR(host->ciu_clk)) { + clk_disable_unprepare(host->ciu_clk); + clk_put(host->ciu_clk); + } +err_clk_biu: + if (!IS_ERR(host->biu_clk)) { + clk_disable_unprepare(host->biu_clk); + clk_put(host->biu_clk); + } return ret; } EXPORT_SYMBOL(dw_mci_probe); @@ -2149,6 +2189,12 @@ void dw_mci_remove(struct dw_mci *host) regulator_put(host->vmmc); } + if (!IS_ERR(host->ciu_clk)) + clk_disable_unprepare(host->ciu_clk); + if (!IS_ERR(host->biu_clk)) + clk_disable_unprepare(host->biu_clk); + clk_put(host->ciu_clk); + clk_put(host->biu_clk); } EXPORT_SYMBOL(dw_mci_remove); diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index a37a573..787ad56 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -78,6 +78,8 @@ struct mmc_data; * @data_offset: Set the offset of DATA register according to VERID. * @dev: Device associated with the MMC controller. * @pdata: Platform data associated with the MMC controller. + * @biu_clk: Pointer to bus interface unit clock instance. + * @ciu_clk: Pointer to card interface unit clock instance. * @slot: Slots sharing this MMC controller. * @fifo_depth: depth of FIFO. * @data_shift: log2 of FIFO item size. @@ -158,6 +160,8 @@ struct dw_mci { u16 data_offset; struct device *dev; struct dw_mci_board *pdata; + struct clk *biu_clk; + struct clk *ciu_clk; struct dw_mci_slot *slot[MAX_MCI_SLOTS]; /* FIFO push and pull */