From patchwork Thu Dec 5 19:20:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Kryger X-Patchwork-Id: 22092 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C1CD023FD0 for ; Thu, 5 Dec 2013 19:21:26 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id oz11sf41203354veb.0 for ; Thu, 05 Dec 2013 11:21:26 -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; bh=4EbD3LgJGjtejSfrVLpt2EMgyAgT6PNOOmbX489EIjg=; b=CpwX7gYvjn4yAHviGs1JBakHKAxgLTYkT+6+qlLp8/J1czThE63ikItWxMNh58oVq+ n0GKjKYW9mSagYyOM3PRSzrxIo6MHABZWNBaqEHDe09yB507Z4WLhTYi4+HXnFlgjFw6 fzKY+mFGZWccasR+to6t9fo7nAn1LTwrIdqJz+eKEn5Ok6x0nN3CWtUYcPwVt93V63nU JCjHm5SsIWqpgWQi76Nvyf9WeWa0vZ1vNL4vup18cvICuvXBAF5Peyyq+wQxPRmiNoxi DUADLGafWerYzL4R5rpvw+LTi9iHQCDSQJItSMr0OD5XcpiZQeBr1S9olBkLimR9QI8k v2hQ== X-Gm-Message-State: ALoCoQnp1p/ajNX9mx+R8hvq4BaU0YgO+J/YVjwtI2fGb23zEfLKzHJWe22nJPVgAIZvXGxCPyTl X-Received: by 10.58.249.208 with SMTP id yw16mr19803948vec.10.1386271286152; Thu, 05 Dec 2013 11:21:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.104.76 with SMTP id gc12ls1043599qeb.44.gmail; Thu, 05 Dec 2013 11:21:26 -0800 (PST) X-Received: by 10.52.168.4 with SMTP id zs4mr2304185vdb.59.1386271286042; Thu, 05 Dec 2013 11:21:26 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id dh7si35263631vcb.113.2013.12.05.11.21.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Dec 2013 11:21:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hu19so13808985vcb.0 for ; Thu, 05 Dec 2013 11:21:25 -0800 (PST) X-Received: by 10.220.183.199 with SMTP id ch7mr8075839vcb.27.1386271285900; Thu, 05 Dec 2013 11:21:25 -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 u4csp40666vcz; Thu, 5 Dec 2013 11:21:25 -0800 (PST) X-Received: by 10.229.118.10 with SMTP id t10mr148228694qcq.5.1386271282728; Thu, 05 Dec 2013 11:21:22 -0800 (PST) Received: from mail-gw2-out.broadcom.com (mail-gw2-out.broadcom.com. [216.31.210.63]) by mx.google.com with ESMTP id h17si46849664qej.41.2013.12.05.11.21.21 for ; Thu, 05 Dec 2013 11:21:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of tkryger@broadcom.com designates 216.31.210.63 as permitted sender) client-ip=216.31.210.63; X-IronPort-AV: E=Sophos;i="4.93,835,1378882800"; d="scan'208";a="365454" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw2-out.broadcom.com with ESMTP; 05 Dec 2013 11:25:40 -0800 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Thu, 5 Dec 2013 11:21:20 -0800 Received: from mail-sj1-12.sj.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Thu, 5 Dec 2013 11:21:20 -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 7BF93207D1; Thu, 5 Dec 2013 11:21:18 -0800 (PST) Received: by mps-infra-lab3.broadcom.com (Postfix, from userid 1004) id 5A091458A13; Thu, 5 Dec 2013 11:21:18 -0800 (PST) From: Tim Kryger To: Christian Daudt , Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Daniel Lezcano , Thomas Gleixner , Chris Ball , Axel Lin CC: Tim Kryger , Device Tree List , Linux ARM Kernel List , Linux Kernel Mailing List , Linux MMC List , Linaro Patches List Subject: [PATCH v4 5/8] mmc: sdhci-bcm-kona: Add basic use of clocks Date: Thu, 5 Dec 2013 11:20:41 -0800 Message-ID: <1386271244-3927-6-git-send-email-tim.kryger@linaro.org> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1386271244-3927-1-git-send-email-tim.kryger@linaro.org> References: <1386271244-3927-1-git-send-email-tim.kryger@linaro.org> MIME-Version: 1.0 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.220.169 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 Reviewed-by: Christian Daudt --- drivers/mmc/host/sdhci-bcm-kona.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 7a190fe..923eefa 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); @@ -316,7 +338,18 @@ err_pltfm_free: static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev) { - return sdhci_pltfm_unregister(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 = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff); + + sdhci_remove_host(host, dead); + + clk_disable_unprepare(kona_dev->external_clk); + + sdhci_pltfm_free(pdev); + + return 0; } static struct platform_driver sdhci_bcm_kona_driver = {