From patchwork Mon Jan 30 10:02:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9544615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 85079604CC for ; Mon, 30 Jan 2017 10:04:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E8A827D76 for ; Mon, 30 Jan 2017 10:04:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6325727F85; Mon, 30 Jan 2017 10:04:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3008D27D76 for ; Mon, 30 Jan 2017 10:04:50 +0000 (UTC) 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 1cY8pM-0002en-0p; Mon, 30 Jan 2017 10:04:48 +0000 Received: from mail-wm0-f47.google.com ([74.125.82.47]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cY8oF-0001sq-Hy for linux-arm-kernel@lists.infradead.org; Mon, 30 Jan 2017 10:03:41 +0000 Received: by mail-wm0-f47.google.com with SMTP id r141so25576087wmg.1 for ; Mon, 30 Jan 2017 02:03:20 -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=cAjprMZL7lixJ6O8hEdPl09m5ssLDsBG08nAWPWVXuo=; b=OsdcLViv3M/huSfurjAph6mf17d7NCuX8CR3xB6vd7ORk9pGXMydY5GzNnOb/ssZzT bENHz6a76Ws/JcLj0D3O1EBhM8HfwCOyh0isB2rUHFeKxBnW+4POE01ccXefbqF7qaBC 8pMCi7HlbolZaKsnNycr3zzjo5kgJBNJ/cr4A3RhjHiuRdxs/K2gKSnbmm7bjyt/1GH0 uwZlzV3h/tAFyp6boEIZiQw4TK/VxJZILJ5AL9pA/ngLyv9BpCCMxxY98syodYqZKoq5 9pHgDeyA/ZW89ZjB2vQLojCMYAtGR1vJGmem7B/rmMYGxg0AGiRL1lCVeULYnpsi7nPv WG9w== 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=cAjprMZL7lixJ6O8hEdPl09m5ssLDsBG08nAWPWVXuo=; b=ESLSWOGYEjfks0HAXB3bnKC+6hnAm3WAAFejRPQbG/lzeDhxfmNiFR9wNh8L8maEMY rzY2yLRfLNamfpIDCj3zusGZy70NJgWqEz9UpZP9316qz9M5CDnNn2uh6L75MyUEHz9z 3uq3aHD+Hw2VMvCDHiT7TjE9DLnqkNnaCRLeEcWlFQ6Qas0E5ZY6cMBW4wJi+n7nZN7z JaISBWpP9HEEBOf+Y8pUwSmbNgFuaqre9YOBD2vWoCBOFUqblLUMa3xWoyJsSgZD3VK+ sdpKgg1McqQ1hH2aMB/p5t0a9QpzyLap07U0tzjyBSOMmKMqBrmQI/57iGX/SQvpTFZe sctg== X-Gm-Message-State: AIkVDXK/mTsRD3cEd5NDh/gG3Lg4w++Zj6xcm9xPJgz+K3XmC1dZ/3UH6hGmsljqi6QSscdn X-Received: by 10.28.209.202 with SMTP id i193mr14756946wmg.20.1485770539370; Mon, 30 Jan 2017 02:02:19 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id j18sm21939536wrb.33.2017.01.30.02.02.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jan 2017 02:02:18 -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 v7 04/14] sata: ahci-da850: get the sata clock using a connection id Date: Mon, 30 Jan 2017 11:02:01 +0100 Message-Id: <1485770531-6772-5-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1485770531-6772-1-git-send-email-bgolaszewski@baylibre.com> References: <1485770531-6772-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170130_020339_746898_A34E73BC X-CRM114-Status: GOOD ( 14.33 ) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for using two clocks in the driver (the sysclk2-based clock and the external REFCLK), check if we got the functional clock after calling ahci_platform_get_resources(). If not, retry calling clk_get() with con_id specified. Signed-off-by: Bartosz Golaszewski Acked-by: Tejun Heo --- drivers/ata/ahci_da850.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c index 267a3d3..e397bab 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 functional clock. This SATA controller + * uses two clocks for which we specify two connection ids. If we don't + * have the functional clock at this point - call clk_get() again with + * con_id = "fck". + */ + if (!hpriv->clks[0]) { + clk = clk_get(dev, "fck"); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + hpriv->clks[0] = clk; + } + rc = ahci_platform_enable_resources(hpriv); if (rc) return rc;