From patchwork Wed May 2 05:07:40 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: 8344 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 6CD0823E1D for ; Wed, 2 May 2012 05:12:18 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3CCC9A18083 for ; Wed, 2 May 2012 05:12:18 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id l4so326334yen.11 for ; Tue, 01 May 2012 22:12:18 -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:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=pm7NxMqkQNadRpsoMcqyLBk7GG5G7dypFLOzXqHO5NM=; b=MakxPpxksPh8iY1/Nw8Hwg+mIGqnjZyYdj9mniGTPPQdGR4QySy/bvXQVCiDoxM5MJ Xu8zr0a0rzUA8bONqgZBnbgADzlDnMAs/BsUweGm+A2KvsvtcY0g6/0ydCg0/qpZZPkJ CbguCQHF0SaOKb2G8w/axN5TQeb72ro++cTZuB9C33G4NkLJ681CN++5O4FiuqobVXdk qcweaAlDyaBULXlyPL9hDMshou4NklJwk6pEUR65RgiML4yL6HW2/VXt2ut2mMBtbUlQ /V8u9rzJs+Be1ZpCVj/yvs4XDv9TU2SuXHArjarh15lZifJjsk4H5bvJy89FOzIAyqZT QeGg== Received: by 10.50.41.196 with SMTP id h4mr3635045igl.33.1335935537812; Tue, 01 May 2012 22:12:17 -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.231.137.198 with SMTP id x6csp227441ibt; Tue, 1 May 2012 22:12:17 -0700 (PDT) Received: by 10.236.161.42 with SMTP id v30mr22800116yhk.127.1335935536684; Tue, 01 May 2012 22:12:16 -0700 (PDT) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id d68si425728yhe.59.2012.05.01.22.12.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 May 2012 22:12:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: by mail-yx0-f178.google.com with SMTP id m14so355607yen.37 for ; Tue, 01 May 2012 22:12:16 -0700 (PDT) Received: by 10.68.134.232 with SMTP id pn8mr5299115pbb.106.1335935535968; Tue, 01 May 2012 22:12:15 -0700 (PDT) Received: from localhost.localdomain ([216.239.45.23]) by mx.google.com with ESMTPS id gv2sm887161pbc.73.2012.05.01.22.12.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 May 2012 22:12:15 -0700 (PDT) From: Thomas Abraham To: linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cjb@laptop.org, grant.likely@secretlab.ca, rob.herring@calxeda.com, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, patches@linaro.org Subject: [PATCH 1/7] mmc: dw_mmc: lookup for optional biu and ciu clocks Date: Tue, 1 May 2012 22:07:40 -0700 Message-Id: <1335935266-25289-2-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335935266-25289-1-git-send-email-thomas.abraham@linaro.org> References: <1335935266-25289-1-git-send-email-thomas.abraham@linaro.org> X-Gm-Message-State: ALoCoQnbEaIYXWJE+MWyZhB7jdG7oGLMdzU7BWvrtRf6YNnP7iGts38QOAesRZuP3mHH6urA9BGB 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 --- drivers/mmc/host/dw_mmc.c | 35 +++++++++++++++++++++++++++++++---- include/linux/mmc/dw_mmc.h | 4 ++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1532357..036846f 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1938,19 +1938,35 @@ 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_info(&host->dev, "biu clock not available\n"); + else + clk_enable(host->biu_clk); + + host->ciu_clk = clk_get(&host->dev, "ciu"); + if (IS_ERR(host->ciu_clk)) + dev_info(&host->dev, "ciu clock not available\n"); + else + clk_enable(host->ciu_clk); + + 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; } - host->bus_hz = host->pdata->bus_hz; host->quirks = host->pdata->quirks; spin_lock_init(&host->lock); INIT_LIST_HEAD(&host->queue); - host->dma_ops = host->pdata->dma_ops; dw_mci_init_dma(host); @@ -2095,6 +2111,13 @@ err_dmaunmap: regulator_disable(host->vmmc); regulator_put(host->vmmc); } + kfree(host); + +err_clk: + clk_disable(host->ciu_clk); + clk_disable(host->biu_clk); + clk_put(host->ciu_clk); + clk_put(host->biu_clk); return ret; } EXPORT_SYMBOL(dw_mci_probe); @@ -2128,6 +2151,10 @@ void dw_mci_remove(struct dw_mci *host) regulator_put(host->vmmc); } + clk_disable(host->ciu_clk); + clk_disable(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 7a7ebd3..fa9a139 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 */