From patchwork Thu Nov 14 19:10:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Kryger X-Patchwork-Id: 21515 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D819B23FDD for ; Thu, 14 Nov 2013 19:11:09 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id z20sf4613406yhz.7 for ; Thu, 14 Nov 2013 11:11:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=WvbY6M02HWfidJcsSdt8lDvV4N0FgFtDP0S/CrIkCHQ=; b=YU03jKuCXBGdk+5q6jXIQIqh8U2/Gb6Jcmq90hzSPp0A6D2fK//x/j0g3rRlKdrh1d lW/WSlZVCYYLKb5eNVvJEZ445XVrmz5C1z18yExVCzqACrWx6qPNOIm2Kl79XJLYaIi6 5xSa8CjWyTeetI81UJNRsqRm05OEl+PCOeiWh3GKHXg8gUN8R3DdQgWmZDCkVG6+cAgc 40Sp6Yauzv93uM6ztRMOjKbfUuDiCi94EI3MRDEwT85h7/pr68SSJPyrBaDyYBr7cVt1 ERkwExL9nSxdmi9hutcJwq0qOUoiT09qzZELcXkcRDgpZxJSezhVoGnLH+yvNwbS1wiJ BlFg== X-Gm-Message-State: ALoCoQnTRybldXcfCfSO5dyfRjkdztxPSgD3/0AKJxsFRniYO9OipghqE13kJaHgHhq6+UbRAGCQ X-Received: by 10.52.31.69 with SMTP id y5mr1074076vdh.4.1384456269425; Thu, 14 Nov 2013 11:11:09 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.97.67 with SMTP id dy3ls1097575qeb.95.gmail; Thu, 14 Nov 2013 11:11:09 -0800 (PST) X-Received: by 10.52.28.180 with SMTP id c20mr449836vdh.97.1384456269282; Thu, 14 Nov 2013 11:11:09 -0800 (PST) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id gw7si17717927veb.38.2013.11.14.11.11.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Nov 2013 11:11:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id o19so2036208vbm.36 for ; Thu, 14 Nov 2013 11:11:09 -0800 (PST) X-Received: by 10.58.49.169 with SMTP id v9mr545993ven.64.1384456269140; Thu, 14 Nov 2013 11:11:09 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp339952vcz; Thu, 14 Nov 2013 11:11:08 -0800 (PST) X-Received: by 10.60.149.169 with SMTP id ub9mr3002993oeb.39.1384456268136; Thu, 14 Nov 2013 11:11:08 -0800 (PST) Received: from mms3.broadcom.com (mms3.broadcom.com. [216.31.210.19]) by mx.google.com with ESMTP id mx9si31094146obc.119.2013.11.14.11.11.07 for ; Thu, 14 Nov 2013 11:11:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of tkryger@broadcom.com designates 216.31.210.19 as permitted sender) client-ip=216.31.210.19; Received: from [10.9.208.57] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Thu, 14 Nov 2013 11:10:10 -0800 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Thu, 14 Nov 2013 11:10:59 -0800 Received: from mail-sj1-12.sj.broadcom.com (10.10.10.20) by IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) with Microsoft SMTP Server id 14.1.438.0; Thu, 14 Nov 2013 11:10:59 -0800 Received: from mps-infra-lab3.broadcom.com ( mps-infra-lab3.sj.broadcom.com [10.19.114.109]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id D18F2207D5; Thu, 14 Nov 2013 11:10:58 -0800 (PST) Received: by mps-infra-lab3.broadcom.com (Postfix, from userid 1004) id 5861B4589FE; Thu, 14 Nov 2013 11:10:58 -0800 (PST) From: "Tim Kryger" To: "Christian Daudt" , "Rob Herring" , "Pawel Moll" , "Mark Rutland" , "Stephen Warren" , "Ian Campbell" , "Daniel Lezcano" , "Thomas Gleixner" , "Chris Ball" cc: "Tim Kryger" , "Device Tree List" , "Linux ARM Kernel List" , "Linux Kernel Mailing List" , "Linux MMC List" , "Linaro Patches List" Subject: [PATCH v3 5/8] mmc: sdhci-bcm-kona: Add basic use of clocks Date: Thu, 14 Nov 2013 11:10:40 -0800 Message-ID: <1384456243-27053-6-git-send-email-tim.kryger@linaro.org> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1384456243-27053-1-git-send-email-tim.kryger@linaro.org> References: <1384456243-27053-1-git-send-email-tim.kryger@linaro.org> MIME-Version: 1.0 X-WSS-ID: 7E9BFF981SC8091018-01-01 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tim.kryger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Enable the external clock needed by the host controller during the probe and disable it during the remove. Signed-off-by: Tim Kryger Reviewed-by: Markus Mayer Reviewed-by: Matt Porter --- drivers/mmc/host/sdhci-bcm-kona.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 85472d3..bffbb40 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -54,6 +54,7 @@ struct sdhci_bcm_kona_dev { struct mutex write_lock; /* protect back to back writes */ + struct clk *external_clk; }; @@ -257,6 +258,24 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) goto err_pltfm_free; } + /* Get and enable the external clock */ + kona_dev->external_clk = devm_clk_get(dev, NULL); + if (IS_ERR(kona_dev->external_clk)) { + dev_err(dev, "Failed to get external clock\n"); + ret = PTR_ERR(kona_dev->external_clk); + goto err_pltfm_free; + } + + if (clk_set_rate(kona_dev->external_clk, host->mmc->f_max) != 0) { + dev_err(dev, "Failed to set rate external clock\n"); + goto err_pltfm_free; + } + + if (clk_prepare_enable(kona_dev->external_clk) != 0) { + dev_err(dev, "Failed to enable external clock\n"); + goto err_pltfm_free; + } + dev_dbg(dev, "non-removable=%c\n", (host->mmc->caps & MMC_CAP_NONREMOVABLE) ? 'Y' : 'N'); dev_dbg(dev, "cd_gpio %c, wp_gpio %c\n", @@ -271,7 +290,7 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) ret = sdhci_bcm_kona_sd_reset(host); if (ret) - goto err_pltfm_free; + goto err_clk_disable; sdhci_bcm_kona_sd_init(host); @@ -307,6 +326,9 @@ err_remove_host: err_reset: sdhci_bcm_kona_sd_reset(host); +err_clk_disable: + clk_disable_unprepare(kona_dev->external_clk); + err_pltfm_free: sdhci_pltfm_free(pdev); @@ -317,6 +339,8 @@ err_pltfm_free: static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev) { struct sdhci_host *host = platform_get_drvdata(pdev); + struct sdhci_pltfm_host *pltfm_priv = sdhci_priv(host); + struct sdhci_bcm_kona_dev *kona_dev = sdhci_pltfm_priv(pltfm_priv); int dead; u32 scratch; @@ -326,6 +350,8 @@ static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev) dead = 1; sdhci_remove_host(host, dead); + clk_disable_unprepare(kona_dev->external_clk); + sdhci_free_host(host); return 0;