From patchwork Fri Mar 23 08:26:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 10302917 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 1B57F60385 for ; Fri, 23 Mar 2018 08:26:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B14428C92 for ; Fri, 23 Mar 2018 08:26:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3D8428C95; Fri, 23 Mar 2018 08:26:34 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D6AD28C92 for ; Fri, 23 Mar 2018 08:26:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751597AbeCWI0d (ORCPT ); Fri, 23 Mar 2018 04:26:33 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:47884 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553AbeCWI0d (ORCPT ); Fri, 23 Mar 2018 04:26:33 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7E31F6030F; Fri, 23 Mar 2018 08:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521793592; bh=NQH5STvF8fABdY301sbD5uPXQZo0JDm0UkU4aso/AOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QkGjxNO3ne1e0gVtXdMhr8sJMOiCZtDJXBgjmWIl248oNng9avNRYAkHySn1KPzZ4 i8R1DRKhTxpCQW4FPNz5Bm311Tgm4NDGrt1eH2XBownsCCZ/wFrE44KJHIVtYyHtdY oy0Nr0Mgg6GL5lhbVfHX6Uj81whwX+Bg3z3BPkic= Received: from blr-ubuntu-173.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: rnayak@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 91F1460F5C; Fri, 23 Mar 2018 08:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521793591; bh=NQH5STvF8fABdY301sbD5uPXQZo0JDm0UkU4aso/AOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=idi9I3vvBCMjdrUSQ5/VBGuJ6NBfCNH/D1Uy49imnD+eglxAGI8X4vSaz2msuGciP b52rNa3M0PXr14fSaRGPa0iCY2jnJl0VpiVMd4Zj9u9vKFTo+wBiXbpNOOZFVYu2nT hG2nZSQ0Unpru1KS/+m0D40p82hOky8b1ejxHTZo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 91F1460F5C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=rnayak@codeaurora.org From: Rajendra Nayak To: sboyd@kernel.org, mturquette@baylibre.com Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, stanimir.varbanov@linaro.org, vivek.gautam@codeaurora.org, srinivas.kandagatla@linaro.org, Rajendra Nayak Subject: [PATCH v2 2/3] clk: qcom: Register the gdscs before the clocks Date: Fri, 23 Mar 2018 13:56:15 +0530 Message-Id: <20180323082616.10142-3-rnayak@codeaurora.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180323082616.10142-1-rnayak@codeaurora.org> References: <20180323082616.10142-1-rnayak@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have atleast some instances of ALWAYS_ON gdscs, which need to be turned ON *before* some clocks within the gdsc domain marked with a CLK_IS_CRITICAL can be turned ON. To facilitate this sequence, register the GDCSs (and hence handle the ALWAYS_ON gdscs) before we register clocks (and handle the clocks marked as CLK_IS_CRITICAL) Signed-off-by: Rajendra Nayak Reviewed-by: Bjorn Andersson Tested-by: Srinivas Kandagatla --- drivers/clk/qcom/common.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index b8064a336d46..39ce64c2783b 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -228,22 +228,6 @@ int qcom_cc_really_probe(struct platform_device *pdev, if (!cc) return -ENOMEM; - cc->rclks = rclks; - cc->num_rclks = num_clks; - - for (i = 0; i < num_clks; i++) { - if (!rclks[i]) - continue; - - ret = devm_clk_register_regmap(dev, rclks[i]); - if (ret) - return ret; - } - - ret = devm_of_clk_add_hw_provider(dev, qcom_cc_clk_hw_get, cc); - if (ret) - return ret; - reset = &cc->reset; reset->rcdev.of_node = dev->of_node; reset->rcdev.ops = &qcom_reset_ops; @@ -272,6 +256,22 @@ int qcom_cc_really_probe(struct platform_device *pdev, return ret; } + cc->rclks = rclks; + cc->num_rclks = num_clks; + + for (i = 0; i < num_clks; i++) { + if (!rclks[i]) + continue; + + ret = devm_clk_register_regmap(dev, rclks[i]); + if (ret) + return ret; + } + + ret = devm_of_clk_add_hw_provider(dev, qcom_cc_clk_hw_get, cc); + if (ret) + return ret; + return 0; } EXPORT_SYMBOL_GPL(qcom_cc_really_probe);