From patchwork Thu Jan 19 13:29:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 91877 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp271389obz; Thu, 19 Jan 2017 05:32:17 -0800 (PST) X-Received: by 10.55.102.7 with SMTP id a7mr8506234qkc.265.1484832737689; Thu, 19 Jan 2017 05:32:17 -0800 (PST) Return-Path: Received: from bombadil.infradead.org ([65.50.211.133]) by mx.google.com with ESMTPS id f128si2611452qkd.168.2017.01.19.05.32.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jan 2017 05:32:17 -0800 (PST) Received-SPF: neutral (google.com: 65.50.211.133 is neither permitted nor denied by best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org) client-ip=65.50.211.133; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=neutral (google.com: 65.50.211.133 is neither permitted nor denied by best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cUCp5-00026e-Eg; Thu, 19 Jan 2017 13:32:15 +0000 Received: from mail-wm0-f49.google.com ([74.125.82.49]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cUCoC-0000gZ-Kq for linux-arm-kernel@lists.infradead.org; Thu, 19 Jan 2017 13:31:22 +0000 Received: by mail-wm0-f49.google.com with SMTP id r144so77146300wme.1 for ; Thu, 19 Jan 2017 05:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dd3oaffUvdNALpCuH4cA+p+i9l+V6/HOJQHNkF+ruQc=; b=K59w5VVRXfNhjKfwK7LwN6GsyhbqmyyRJOc9DQsmSqruZUdukTjI54SRBH7tDxBHFe Hkhaako0Q9O7RUNJzhtEVQlXNcQEBqn5JGHaWpWSsHiAk2TlYO5ktbZylLq5yB0kL/GW 553OW63ikHSQpSxufZUVX1nqqL4+Px8C+aUY+nybjoAStW+XLNoqpf0WKWkpTjK55smI /v9+wu2T4G3vOO8UomExOdGA7Q0bu9jeQH1I0HEhGklF1osgcWxLnomj6xLtum9kQfD2 /o0hKQHBlnzFl17ubNTcds+yvRFzKlJPMNRKsp31w9RgIbo31OzqZ33moKHl2mAtq0Pw 2HsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dd3oaffUvdNALpCuH4cA+p+i9l+V6/HOJQHNkF+ruQc=; b=P99cRwbk6nf+mJluxpt8yq9qhpbGuiTQRru4OG/lTXfipZo05XySHaMIRKY10eIQbE tMOvfPBOrnqAtV7N5vNVExpXOLElUrFDg9Btoq5fsRtnGuVQBS9pm9oN3qDbVpST+dPx Qhmh7WPsA2UOd7i9SMwKuu8oyuaAX0j2+6druhz31y72/l8S3IkBIf5uAf9lI61mRaXC kqYqrL7rpjrtZf0bCK/e7EN1UKlLf0xZnW1UefrNIxp1VuL7SdTSBVBiINpgdPvKBkaU 6Cs6S/B3nEawUEpZBCuanKZjPWaHhv7RthIUqP9hboWqPzVl1ZDEuysDvph4SJzSbHOM 092g== X-Gm-Message-State: AIkVDXLT3qok8Ndd6QiffZLNze8rpbvVMK+2p71RvskT41/teleVaskZ2TXDJcIzj/GjFfIT X-Received: by 10.28.138.136 with SMTP id m130mr23814505wmd.72.1484832598815; Thu, 19 Jan 2017 05:29:58 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id c202sm53251996wmd.10.2017.01.19.05.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 05:29:58 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Sekhar Nori , Patrick Titiano , Michael Turquette , Tejun Heo , Rob Herring , Mark Rutland , Russell King , David Lechner Subject: [PATCH v4 04/14] sata: ahci-da850: get the sata clock using a connection id Date: Thu, 19 Jan 2017 14:29:38 +0100 Message-Id: <1484832588-18413-5-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484832588-18413-1-git-send-email-bgolaszewski@baylibre.com> References: <1484832588-18413-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170119_053121_006052_54DD0C22 X-CRM114-Status: GOOD ( 14.64 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [74.125.82.49 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [74.125.82.49 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.49 listed in wl.mailspike.net] 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-ide@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org In preparation for using two clocks in the driver (the sysclk2-based clock and the external REFCLK), check if we got a functional clock after calling ahci_platform_get_resources(). If not, retry calling clk_get() with con_id specified. Signed-off-by: Bartosz Golaszewski --- drivers/ata/ahci_da850.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.9.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c index 267a3d3..8cfdc86 100644 --- a/drivers/ata/ahci_da850.c +++ b/drivers/ata/ahci_da850.c @@ -71,12 +71,28 @@ static int ahci_da850_probe(struct platform_device *pdev) struct ahci_host_priv *hpriv; struct resource *res; void __iomem *pwrdn_reg; + struct clk *clk; int rc; hpriv = ahci_platform_get_resources(pdev); if (IS_ERR(hpriv)) return PTR_ERR(hpriv); + /* + * Internally ahci_platform_get_resources() calls clk_get(dev, NULL) + * when trying to obtain the first clock. This SATA controller uses + * two clocks for which we specify two connection ids. If we don't + * have a clock at this point - call clk_get() again with + * con_id = "sata". + */ + if (!hpriv->clks[0]) { + clk = clk_get(dev, "sata"); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + hpriv->clks[0] = clk; + } + rc = ahci_platform_enable_resources(hpriv); if (rc) return rc;