From patchwork Wed Jan 18 13:19:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9523745 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 898E66020A for ; Wed, 18 Jan 2017 13:22:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A05A20246 for ; Wed, 18 Jan 2017 13:22:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E97E285E8; Wed, 18 Jan 2017 13:22:29 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C06A20246 for ; Wed, 18 Jan 2017 13:22:29 +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 1cTqC4-0000vX-7g; Wed, 18 Jan 2017 13:22:28 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTqAN-0006kr-M0 for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2017 13:20:46 +0000 Received: by mail-wm0-x233.google.com with SMTP id r126so244761528wmr.0 for ; Wed, 18 Jan 2017 05:20:22 -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=o7p/c2CsiNyFltxj2yFn8uutcitqyh0b8f1cQPtRe++yR+kv/L6dcq8Vw1ZM23x3d/ Gubxv62Pc767ZUVeG+wPQcL/mbKIBQ01NzNd9hTNIuTW+EA4JOzHIn/mBwzNujLUYUu1 yE4jdGsZOVFeurIsuafzd5KoZFPJ3ShkcrtiEZMRInrpSAIwdsbQHPT5leVL1vSq+k8Y RUlL6AE7uIClj5zwHZK1YoWPQwCApTwnPMC63QAP8zSZicupdfDR29OSp2fLEklKJUAi EPQCTQASHpZFUOECNiPhyxwUuxZ7trMjEuIPdV2V/ZlzPtALipRZT9nX1etq6qU8zgsO BY2g== 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=EdshwejL3eB9zs3E9LMTbPi8XuGOS2tWN1WCAdhJjKqnRDtYPMTJvjgCgmbIdvMK4l ZFdmDYbyucVt6v7AXV6tY7MUVHafoMZDqWZK0Awny/kmmWTxi8wcMscx8nh0jW39pMtX 3kcEYzATkEIsRG/T6em9AanDGUczYd3HXKA1xhAfjXueuU/sV1Mqxup/PEJB8JJTRc58 7JPwWcsf2hNr8NG4k7lUuZHJNElSrnCy1TzrIVgoQJ7uWvHcoBsIJFQXyRTF/mLpTvns LXNsx33JoPz9MWdLXv192Fz1nzamlv1bdmY5NYgUw+umRBYfMSV6gCU/eXybKkjUdcth TdOw== X-Gm-Message-State: AIkVDXK3NdSJTKCUO92H3/3jqPxgECKPwp/CqlA3jzdi0TFM74QBuLTNVXsNtMAs46w82tno X-Received: by 10.223.134.151 with SMTP id 23mr3449505wrx.0.1484745620946; Wed, 18 Jan 2017 05:20:20 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id w79sm4899569wmw.0.2017.01.18.05.20.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jan 2017 05:20:20 -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 v3 04/13] sata: ahci-da850: get the sata clock using a connection id Date: Wed, 18 Jan 2017 14:19:52 +0100 Message-Id: <1484745601-4769-5-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484745601-4769-1-git-send-email-bgolaszewski@baylibre.com> References: <1484745601-4769-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170118_052044_048321_55833F9B X-CRM114-Status: GOOD ( 14.34 ) 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;