From patchwork Fri Jan 20 11:21:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9528025 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 AB7CA6020B for ; Fri, 20 Jan 2017 11:24:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D2D0201F5 for ; Fri, 20 Jan 2017 11:24:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91DDD285F5; Fri, 20 Jan 2017 11:24:42 +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 30B31201F5 for ; Fri, 20 Jan 2017 11:24:42 +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 1cUXJ8-0007si-EE; Fri, 20 Jan 2017 11:24:38 +0000 Received: from mail-wm0-f43.google.com ([74.125.82.43]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cUXI6-00065P-RE for linux-arm-kernel@lists.infradead.org; Fri, 20 Jan 2017 11:23:36 +0000 Received: by mail-wm0-f43.google.com with SMTP id c85so32866216wmi.1 for ; Fri, 20 Jan 2017 03:23:14 -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=0rdwPwXHHZe99K8EAJWCiAIxD1IzP0ig2IX0a4A44Tca5edTw5BfTD3lgxQ7Z45RAk ki4kUOaPazTXTf+48COY/m0nLHKRHeqb67QlgKv1VTLoa7RseENBguQe9yKVlNqgLwNZ FePf908Fsm2t+H7Ol1ybLWRI9SyP2Lh2YNbZCuLSRoE9B9ML/21quJbCNmI81wa2yhZB Exfl8JztkXfwfuCkm5VvAl87XBgw8L4nC1CtpQLsuz9rDq/9golTekzcbC9GA4BxHZXO R0PGadvwNvlVAjtlgMisACHLWr/x6fV95wvUvYvGRJZFkhk69N9rFeydpMagt3yt/HAA tQEw== 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=DRGmjNKcGvh0bkg3Oj/lDa7Tsh9rXDCffliFy0oyLdIA0/XwNNseUaGz0pCz63OUgt 0VkKbIRAft6Rjui5c7Q6/o8g7MtwlW7ZCKzvcsw9sucuLrSaq+VTpXW/MJZui4BoPOZ1 qydxc/B3x27wgwROKNR0yyQZCZLFU8dqZkIao1oZrkOGyqHwJ6igl8LXF6yfkjxX4uf1 7I4oVNwNz3SRhcwl3pLuWR+beONjVFvgVUwvmGZIdc/eitdu1oUgixblbQNpAqTwZk1C /C7KSI1TQHF21ihwK8DFN85hrXztG+pUewjTseZTaTHqDxd9A9givS+Nsgc1Dmm37rop oPog== X-Gm-Message-State: AIkVDXKnaikkxcYq2yTgXlyGH4jtmRGQNY4Ccc6rk/XIDLFwLXkJqFGie9e7VPDboKDvnkT/ X-Received: by 10.28.210.139 with SMTP id j133mr2808200wmg.67.1484911333372; Fri, 20 Jan 2017 03:22:13 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id l74sm5482402wmg.2.2017.01.20.03.22.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 03:22:12 -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 v5 04/14] sata: ahci-da850: get the sata clock using a connection id Date: Fri, 20 Jan 2017 12:21:55 +0100 Message-Id: <1484911325-23425-5-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484911325-23425-1-git-send-email-bgolaszewski@baylibre.com> References: <1484911325-23425-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170120_032335_104623_BA3AE5D0 X-CRM114-Status: GOOD ( 13.79 ) 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 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(+) 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;