From patchwork Thu Oct 12 06:58:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 10001145 X-Patchwork-Delegate: agross@codeaurora.org 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 92EC0603B5 for ; Thu, 12 Oct 2017 06:59:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8662A28CF3 for ; Thu, 12 Oct 2017 06:59:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B5B728CF4; Thu, 12 Oct 2017 06:59:14 +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=unavailable 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 35BDB28CF6 for ; Thu, 12 Oct 2017 06:59:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690AbdJLG7N (ORCPT ); Thu, 12 Oct 2017 02:59:13 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:42836 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751924AbdJLG7M (ORCPT ); Thu, 12 Oct 2017 02:59:12 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 484AD6087A; Thu, 12 Oct 2017 06:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1507791552; bh=dqwBz5oDjbaHh2FiMM6+zOojeGoAAvyj8mRCfwPT2WE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JjrdCKOt2NnFWBQy0JqdsQC3UreNBPqwIMqLra/iBYxk8r1O+XgjsN4gbvq0DMTGS 7ROECIWYC6BH60+fEApTCToZWGjn8c+yrzhthkBf64b2DseCKGswZVgtttcQ8s6L0Z DKmcxP0Rb3rH1340mw4EH9r/wJo+cNRRKea4bvSU= Received: from blr-ubuntu-173.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: rnayak@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 10DD4607E1; Thu, 12 Oct 2017 06:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1507791551; bh=dqwBz5oDjbaHh2FiMM6+zOojeGoAAvyj8mRCfwPT2WE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E7DZ0twLI0O6v0tDt2s7k8vm+m7hMGh39IQbrTIcC3O794gPGEC0gEOR/AUFzIyik ZmMCxi9tSrKYIdmte6PBS6CI3IZBe85eSKl3oD4idcC5t2Y3/xxwYNXi5jdfRsfh6S zamHSR0KWeQMybocm06MmhRN2e1EgrGQUCunukhI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 10DD4607E1 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@codeaurora.org, mturquette@baylibre.com Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, stanimir.varbanov@linaro.org, vivek.gautam@codeaurora.org, architt@codeaurora.org, Rajendra Nayak Subject: [PATCH 2/3] clk: qcom: Register the gdscs before the clocks Date: Thu, 12 Oct 2017 12:28:48 +0530 Message-Id: <1507791529-24353-3-git-send-email-rnayak@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507791529-24353-1-git-send-email-rnayak@codeaurora.org> References: <1507791529-24353-1-git-send-email-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: Archit Taneja --- 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 d523991..d7b0b6b 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -232,6 +232,22 @@ int qcom_cc_really_probe(struct platform_device *pdev, size_t num_clks = desc->num_clks; struct clk_regmap **rclks = desc->clks; + if (desc->gdscs && desc->num_gdscs) { + scd = devm_kzalloc(dev, sizeof(*scd), GFP_KERNEL); + if (!scd) + return -ENOMEM; + scd->dev = dev; + scd->scs = desc->gdscs; + scd->num = desc->num_gdscs; + ret = gdsc_register(scd, &reset->rcdev, regmap); + if (ret) + return ret; + ret = devm_add_action_or_reset(dev, qcom_cc_gdsc_unregister, + scd); + if (ret) + return ret; + } + cc = devm_kzalloc(dev, sizeof(*cc), GFP_KERNEL); if (!cc) return -ENOMEM; @@ -276,22 +292,6 @@ int qcom_cc_really_probe(struct platform_device *pdev, if (ret) return ret; - if (desc->gdscs && desc->num_gdscs) { - scd = devm_kzalloc(dev, sizeof(*scd), GFP_KERNEL); - if (!scd) - return -ENOMEM; - scd->dev = dev; - scd->scs = desc->gdscs; - scd->num = desc->num_gdscs; - ret = gdsc_register(scd, &reset->rcdev, regmap); - if (ret) - return ret; - ret = devm_add_action_or_reset(dev, qcom_cc_gdsc_unregister, - scd); - if (ret) - return ret; - } - return 0; } EXPORT_SYMBOL_GPL(qcom_cc_really_probe);