From patchwork Tue Jan 17 12:26:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 91621 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp463450qgi; Tue, 17 Jan 2017 04:28:03 -0800 (PST) X-Received: by 10.98.50.66 with SMTP id y63mr18085486pfy.21.1484656083255; Tue, 17 Jan 2017 04:28:03 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id t6si24794442pfi.59.2017.01.17.04.28.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 04:28:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) 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 1cTSrp-00067z-Bs; Tue, 17 Jan 2017 12:28:01 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTSr0-0004ku-2t for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 12:27:12 +0000 Received: by mail-wm0-x230.google.com with SMTP id r126so198492890wmr.0 for ; Tue, 17 Jan 2017 04:26:49 -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=2uXacrTm6OBv58SIwPSO2r0dryGzYopWmhL+gV67mNU=; b=oylN8vAcGKMJAv0adocRy38a4d+XUhfvBk3rcq7u8UTsC21mEFllKNKVSmd06nliH6 3mGKVYDTCx4A3SGdQNh9QmVPkfwbm5srixgPMIa/9qMzq4yMikq21eIka7huvdogO+IL kmQ6v3k0CjShTwYWeczdLFCXLJFUFalXJOW/4kzZhPWjVIbWn4vaQI5ftV9kpM8/2+Ie Xoj0IqbC7KLlF0tiWiSvx3lykdK8NsTK5YpV5r9lhLghQOyPHYeUC4uUimUGbY9oH81D lcBQkxeKYhey5+qXD9JYQvQsv4rxsUoQ1O3odK6ojn0McFp0kvl/UaMcpuPdOZXc/Ii9 d3RA== 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=2uXacrTm6OBv58SIwPSO2r0dryGzYopWmhL+gV67mNU=; b=e0ph5pWcQDOZMav2GjHwjXD4QD4gCw7fKyMUh/oGnS9Q/T4Q2Y5ntgH7SSbd0olaLO 32v9hvl4UqPYjf4Elsda8qva/kSglQB2rD4u5n0nZ0XIL0/tDA+/8RY5uByUafI8c4uF EZvqlOe2LXFm01QXIIOwQOLvHZDOLA1GnTyVq5Mq4RvGHoDeICzkc5F8ZqhnBsJBFZn1 ff3OOKHTxLxlWdlMK3s0o9FJzqsooTcNnHdzI9Zo6GT7XsPV30umuSIof4TRzZvF759F xlK6LpAtmiufWXaQMGDlo+VQJmNTryIGcfNcnpZShos20IIVFsiASy6Q13KnOhedx4je 6haA== X-Gm-Message-State: AIkVDXInpa4PG88DZ9fBPVT05G/h2cwd2bUxCUCEwfLzFvXRk+7eBGG9Sd9RsTdWMwiO/wIk X-Received: by 10.223.151.205 with SMTP id t13mr27517560wrb.9.1484656008272; Tue, 17 Jan 2017 04:26:48 -0800 (PST) Received: from bgdev-debian.lan (jua06-1-82-242-157-225.fbx.proxad.net. [82.242.157.225]) by smtp.gmail.com with ESMTPSA id o143sm5466112wmd.3.2017.01.17.04.26.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 04:26:47 -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 v2 04/14] sata: ahci-da850: get the sata clock using a connector id Date: Tue, 17 Jan 2017 13:26:06 +0100 Message-Id: <1484655976-25382-5-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484655976-25382-1-git-send-email-bgolaszewski@baylibre.com> References: <1484655976-25382-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170117_042710_361434_E3146F8A X-CRM114-Status: GOOD ( 14.29 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:230 listed in] [list.dnswl.org] 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 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 get_clk() 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..18f57c2 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 connector 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;