From patchwork Fri Jul 8 13:13:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12911142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08F00CCA481 for ; Fri, 8 Jul 2022 13:13:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237981AbiGHNNk (ORCPT ); Fri, 8 Jul 2022 09:13:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237612AbiGHNNj (ORCPT ); Fri, 8 Jul 2022 09:13:39 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79470248F5 for ; Fri, 8 Jul 2022 06:13:37 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id n15so25866481ljg.8 for ; Fri, 08 Jul 2022 06:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IjR+2F8VDVzWZtZbL2H5UO7CpeJEqxrSNDvsv43xJOY=; b=I0msIR1xHsrK427ROpYty93HRV1Cf5ngV2kxkvQkzAOxgzph0oKhs9P+bDanaafDLZ H0XsGEMCv7ljW1RXECph6U9flE4iF1S7+BehA1PsEdQBVth996KZ31klFnJhQtGMBGym gZ4pqEmQU99IpsBtLL7Rd0eebCucU/ERWyP3yoT/iZkZ02SVD4J4n0RXu4Z9zMC0IFoL M/RHb34qu0cWPhxkgMV92AGLwvbwLovkIE90g1Lk+B3iyyM3uDreLi5LUPCzegERyUH+ GmGUxUGPvYj5M1vCTsanDd1UCZb5tM3Ir/ttI38F2MjmrAOBRfl6WHGdazXNcYVcAHhX hYXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IjR+2F8VDVzWZtZbL2H5UO7CpeJEqxrSNDvsv43xJOY=; b=aj4Jfs52co3ps9gP3bfdUHvpbEnLtbcNb9oLXXLR2o1mCCDyiGSu5u3OJE+x9fImZ0 IAEUSsFkjGqqclQ1aiVwuJpWUjCmOk2d/UgH6IfuNg49kYd+5eUBRf5qTLih4YY0H13F q7E8qAgfnyoyQYdHCLz9k+a4bCqh9zUgPbCkVJg6Ul5XevAhkV1t0Q39BHRnQxtYyNqi u154eZosvhm/X1io80p2mafBe2IYcPcbpQlJOnBUKR7s7UDlGvPe3Te9AjhNVRPdIH6t Tzlj6y9aq1XPUTubyRuzBSPOr3x0Wo4eczBkMiFeEz8AMRgjuhVBAMdTY9rJJhIjfU/v p/DA== X-Gm-Message-State: AJIora81MKDToBju9L9Y04vNCQEgeXKpb9vSRhD930Xi62ZxbpCALka3 bwGk1jW6yiDOLFs2G4dtwINNsw== X-Google-Smtp-Source: AGRyM1vS4wofuQbXsdOj4XwEHt7DCrtCFNOpkaD2vtOzu4vM+8vBWRpkAEjkfAI0qItm3zkqMesnhQ== X-Received: by 2002:a2e:a54d:0:b0:25d:4fc6:7b4d with SMTP id e13-20020a2ea54d000000b0025d4fc67b4dmr1859128ljn.11.1657286015648; Fri, 08 Jul 2022 06:13:35 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id bu35-20020a05651216a300b0047255d211b9sm7410844lfb.232.2022.07.08.06.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 06:13:35 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Taniya Das , Vinod Koul , Kishon Vijay Abraham I Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-phy@lists.infradead.org, Johan Hovold Subject: [PATCH v2 1/3] clk: asm9260: use new helper for fixed rate clock creation Date: Fri, 8 Jul 2022 16:13:31 +0300 Message-Id: <20220708131333.2836900-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708131333.2836900-1-dmitry.baryshkov@linaro.org> References: <20220708131333.2836900-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The __clk_hw_register_fixed_rate() is an internal API, which is better not to be called directly. Add new helper to create fixed rate clocks using parent clock accuracy. Signed-off-by: Dmitry Baryshkov --- drivers/clk/clk-asm9260.c | 6 ++---- include/linux/clk-provider.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-asm9260.c b/drivers/clk/clk-asm9260.c index bacebd457e6f..0609b661ff5a 100644 --- a/drivers/clk/clk-asm9260.c +++ b/drivers/clk/clk-asm9260.c @@ -276,10 +276,8 @@ static void __init asm9260_acc_init(struct device_node *np) /* TODO: Convert to DT parent scheme */ ref_clk = of_clk_get_parent_name(np, 0); - hw = __clk_hw_register_fixed_rate(NULL, NULL, pll_clk, - ref_clk, NULL, NULL, 0, rate, 0, - CLK_FIXED_RATE_PARENT_ACCURACY); - + hw = clk_hw_register_fixed_rate_parent_accuracy(NULL, pll_clk, ref_clk, + 0, rate); if (IS_ERR(hw)) panic("%pOFn: can't register REFCLK. Check DT!", np); diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 72d937c03a3e..659ef5a77246 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -439,6 +439,20 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ (parent_data), NULL, (flags), \ (fixed_rate), (fixed_accuracy), 0) +/** + * clk_hw_register_fixed_rate_parent_accuracy - register fixed-rate clock with + * the clock framework + * @dev: device that is registering this clock + * @name: name of this clock + * @parent_name: name of clock's parent + * @flags: framework-specific flags + * @fixed_rate: non-adjustable clock rate + */ +#define clk_hw_register_fixed_rate_parent_accuracy(dev, name, parent_name, \ + flags, fixed_rate) \ + __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), \ + NULL, NULL, (flags), (fixed_rate), 0, \ + CLK_FIXED_RATE_PARENT_ACCURACY) void clk_unregister_fixed_rate(struct clk *clk); void clk_hw_unregister_fixed_rate(struct clk_hw *hw); From patchwork Fri Jul 8 13:13:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12911143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD407CCA482 for ; Fri, 8 Jul 2022 13:13:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237612AbiGHNNk (ORCPT ); Fri, 8 Jul 2022 09:13:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237918AbiGHNNk (ORCPT ); Fri, 8 Jul 2022 09:13:40 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FA2F193C3 for ; Fri, 8 Jul 2022 06:13:38 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id bx13so25895486ljb.1 for ; Fri, 08 Jul 2022 06:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EZUGt5gCk+MdWylcaBkZx6phsLIE0h86j1sFH20tEAQ=; b=Imun3DssP+gN9SFvJsuMI84SYSOq+zqOK/8No7LDRyA2SZWTGJm4q8me89NerVkElF Hki+qq2zvhehRtizuTCYA5IfNsXzHTrpc6YFy6DxRac4/vqK6vR7p77dyypT14FnskPp iPtmOgZJ11hrH79z9b5vdsz5qmDLLPBWc/RyRdhPKkl/AoO1tlgQiJM2d63ev65jAaeb 31WW1AnKpO/q5fa/k2KIrZ21zBomghz/V99H5+k/j9HCqhoNsQQIiCCwP9n8NH3BQqoM I1aNSssuR31D2jWugusj/FYnPFEMgfOMIj7O+tgJKzm3QgfjObPWeIXwi+yffRnXJcOT FvIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EZUGt5gCk+MdWylcaBkZx6phsLIE0h86j1sFH20tEAQ=; b=uojdkQKoW3+rQvRwbRcp6AvLy689997oq4ZQOgX16SSpGTksINpCE55sDEqVfsIkOh 40CuOBzSsEk2rcx5Ysr2/PNNOdQPm7CfwQmhE6qHHyTKsTFoZz8KEPd/DDfv5Bbi8AsY JsgJCiqXgrlKLYBzCO8Z7uSSUcmpQcMgxULjQ9rEWJk7jdUW4HP+cvR2ZIUHVJq1P3KC njUKXVi7j9+tbbuoEj6khgLYzdhr5NEY6wy7LLatCYbgJPao4YAZ2Ea34KTyVSBA7rFo z6dlcxND9Mb4v/nbCknIEMinjLsZhYbCI4uMh12qIGsPoyPGmumSx8iSpT4C7WOCbVx/ 9uYQ== X-Gm-Message-State: AJIora/8GSffEN1hyMb/dGr/AbhTH2pQgxJ3GJVF5QQBkQXtB6e5M4Oh N0zajRnyqiAYv9w6MBBgjQUTCQ== X-Google-Smtp-Source: AGRyM1tqHQx/1r/aBGlQNsqoXL9sktwcRI6bAHmrIC6HeQ/BHk/Sng6R+DaaOfBzOzsCS+CGqjyeuA== X-Received: by 2002:a2e:5052:0:b0:25d:4786:1617 with SMTP id v18-20020a2e5052000000b0025d47861617mr1906030ljd.332.1657286016504; Fri, 08 Jul 2022 06:13:36 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id bu35-20020a05651216a300b0047255d211b9sm7410844lfb.232.2022.07.08.06.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 06:13:35 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Taniya Das , Vinod Koul , Kishon Vijay Abraham I Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-phy@lists.infradead.org, Johan Hovold Subject: [PATCH v2 2/3] clk: fixed-rate: add devm_clk_hw_register_fixed_rate Date: Fri, 8 Jul 2022 16:13:32 +0300 Message-Id: <20220708131333.2836900-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708131333.2836900-1-dmitry.baryshkov@linaro.org> References: <20220708131333.2836900-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add devm_clk_hw_register_fixed_rate(), devres-managed helper to register fixed-rate clock. Signed-off-by: Dmitry Baryshkov --- drivers/clk/clk-fixed-rate.c | 28 ++++++++++++++++++++++++---- include/linux/clk-provider.h | 29 +++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c index ac68a6b40f0e..7d775954e26d 100644 --- a/drivers/clk/clk-fixed-rate.c +++ b/drivers/clk/clk-fixed-rate.c @@ -49,12 +49,24 @@ const struct clk_ops clk_fixed_rate_ops = { }; EXPORT_SYMBOL_GPL(clk_fixed_rate_ops); +static void devm_clk_hw_register_fixed_rate_release(struct device *dev, void *res) +{ + struct clk_fixed_rate *fix = res; + + /* + * We can not use clk_hw_unregister_fixed_rate, since it will kfree() + * the hw, resulting in double free. Just unregister the hw and let + * devres code kfree() it. + */ + clk_hw_unregister(&fix->hw); +} + struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev, struct device_node *np, const char *name, const char *parent_name, const struct clk_hw *parent_hw, const struct clk_parent_data *parent_data, unsigned long flags, unsigned long fixed_rate, unsigned long fixed_accuracy, - unsigned long clk_fixed_flags) + unsigned long clk_fixed_flags, bool devm) { struct clk_fixed_rate *fixed; struct clk_hw *hw; @@ -62,7 +74,11 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev, int ret = -EINVAL; /* allocate fixed-rate clock */ - fixed = kzalloc(sizeof(*fixed), GFP_KERNEL); + if (devm) + fixed = devres_alloc(devm_clk_hw_register_fixed_rate_release, + sizeof(*fixed), GFP_KERNEL); + else + fixed = kzalloc(sizeof(*fixed), GFP_KERNEL); if (!fixed) return ERR_PTR(-ENOMEM); @@ -90,9 +106,13 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev, else ret = of_clk_hw_register(np, hw); if (ret) { - kfree(fixed); + if (devm) + devres_free(fixed); + else + kfree(fixed); hw = ERR_PTR(ret); - } + } else if (devm) + devres_add(dev, fixed); return hw; } diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 659ef5a77246..5058c8175fd1 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -350,7 +350,7 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev, const char *parent_name, const struct clk_hw *parent_hw, const struct clk_parent_data *parent_data, unsigned long flags, unsigned long fixed_rate, unsigned long fixed_accuracy, - unsigned long clk_fixed_flags); + unsigned long clk_fixed_flags, bool devm); struct clk *clk_register_fixed_rate(struct device *dev, const char *name, const char *parent_name, unsigned long flags, unsigned long fixed_rate); @@ -365,7 +365,20 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, */ #define clk_hw_register_fixed_rate(dev, name, parent_name, flags, fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \ - NULL, (flags), (fixed_rate), 0, 0) + NULL, (flags), (fixed_rate), 0, 0, false) + +/** + * devm_clk_hw_register_fixed_rate - register fixed-rate clock with the clock + * framework + * @dev: device that is registering this clock + * @name: name of this clock + * @parent_name: name of clock's parent + * @flags: framework-specific flags + * @fixed_rate: non-adjustable clock rate + */ +#define devm_clk_hw_register_fixed_rate(dev, name, parent_name, flags, fixed_rate) \ + __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \ + NULL, (flags), (fixed_rate), 0, 0, true) /** * clk_hw_register_fixed_rate_parent_hw - register fixed-rate clock with * the clock framework @@ -378,7 +391,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, #define clk_hw_register_fixed_rate_parent_hw(dev, name, parent_hw, flags, \ fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw), \ - NULL, (flags), (fixed_rate), 0, 0) + NULL, (flags), (fixed_rate), 0, 0, false) /** * clk_hw_register_fixed_rate_parent_data - register fixed-rate clock with * the clock framework @@ -392,7 +405,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ (parent_data), (flags), (fixed_rate), 0, \ - 0) + 0, false) /** * clk_hw_register_fixed_rate_with_accuracy - register fixed-rate clock with * the clock framework @@ -408,7 +421,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, fixed_accuracy) \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), \ NULL, NULL, (flags), (fixed_rate), \ - (fixed_accuracy), 0) + (fixed_accuracy), 0, false) /** * clk_hw_register_fixed_rate_with_accuracy_parent_hw - register fixed-rate * clock with the clock framework @@ -423,7 +436,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, parent_hw, flags, fixed_rate, fixed_accuracy) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw) \ NULL, NULL, (flags), (fixed_rate), \ - (fixed_accuracy), 0) + (fixed_accuracy), 0, false) /** * clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate * clock with the clock framework @@ -438,7 +451,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, parent_data, flags, fixed_rate, fixed_accuracy) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ (parent_data), NULL, (flags), \ - (fixed_rate), (fixed_accuracy), 0) + (fixed_rate), (fixed_accuracy), 0, false) /** * clk_hw_register_fixed_rate_parent_accuracy - register fixed-rate clock with * the clock framework @@ -452,7 +465,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, flags, fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), \ NULL, NULL, (flags), (fixed_rate), 0, \ - CLK_FIXED_RATE_PARENT_ACCURACY) + CLK_FIXED_RATE_PARENT_ACCURACY, false) void clk_unregister_fixed_rate(struct clk *clk); void clk_hw_unregister_fixed_rate(struct clk_hw *hw); From patchwork Fri Jul 8 13:13:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12911144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 490FBCCA483 for ; Fri, 8 Jul 2022 13:13:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237980AbiGHNNl (ORCPT ); Fri, 8 Jul 2022 09:13:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238028AbiGHNNk (ORCPT ); Fri, 8 Jul 2022 09:13:40 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AB69192B8 for ; Fri, 8 Jul 2022 06:13:39 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id m18so17828342lfg.10 for ; Fri, 08 Jul 2022 06:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y8TSA2xKiR+ulbyqdsf+IyUQd58t84mxTi/hjRtwdLo=; b=QRrMtgZXoJzyqyLeF66dY/ZAudNIiXmwhJoWSLh1Aco6eJVyrtI1npkyShxIVyEMep LbndmaW2tbJUgMtXAGTyNQxR+MSH7RBtnn3frSqOveJ5iuCDatFLN8ZcNNZLkJRWrxQ6 WPo4/qtqYAEcVfZDOU7YV4lF7br0ozkvyX+PAYNqt7+FV9i7EcFl/9fXKAf411G4hqV4 +SgDtR+DQTIFozrTO6UiHg6/dFYzfbQK8jQXNxiH2YPEXfdqjSaO6fCTD4bWO7Vblm4N bskrnVSxW+//wgk3uMfSoEfwrU2EUENubtNCdc/vJvG9XVW4VGd9hxg7zFvGmnowerN7 PiuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y8TSA2xKiR+ulbyqdsf+IyUQd58t84mxTi/hjRtwdLo=; b=G7PJt1d852oA9KyUxFcIIe8ArbfR1K8SG3FxxYwUxe3b2jIZ0J9MH5h1GPZGa9FJDN AnmjC7Excf4YxuaZ56Cu6cmTh+43s+VXyla7um53KMglScacwoU6MNhtd3ZUXX/gWKwT YHsp5RDfD9pLiywnqCjucCxHDO6l9FSIDcBVhGZbvTWgAkvHZLEe+rH17E66BxBeXZeY V1gln7n0x+esj1ANltdBLpC6muPdMymi/9bypjlEwFslA4bflmPsUKcJXDTI2rvIWbOM id5KKV7EtmC4KpKIHdeONYAMe3XjNvmHnKirFLTGLrYPeN6Y3EaxvQ8nFeA0tccTOPQF 5ANA== X-Gm-Message-State: AJIora+WlrOSo4iDODsb7i1A97p4LNppzqegb8Ug6j5hY5W2jpAUNX1U tPwJwRLIHiJz1uBGgyMX+jaUNQ== X-Google-Smtp-Source: AGRyM1tEvHOU0pcHFvUMweAbz0mzrQdkbOshaz9Gkqxty23oTKKIa2MeGFPDkrlWi/YlKEHT/hV2Lg== X-Received: by 2002:a05:6512:3c96:b0:488:c36d:b336 with SMTP id h22-20020a0565123c9600b00488c36db336mr2347724lfv.410.1657286017563; Fri, 08 Jul 2022 06:13:37 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id bu35-20020a05651216a300b0047255d211b9sm7410844lfb.232.2022.07.08.06.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 06:13:37 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Taniya Das , Vinod Koul , Kishon Vijay Abraham I Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-phy@lists.infradead.org, Johan Hovold Subject: [PATCH v2 3/3] phy: qcom-qmp-ufs: provide symbol clocks Date: Fri, 8 Jul 2022 16:13:33 +0300 Message-Id: <20220708131333.2836900-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708131333.2836900-1-dmitry.baryshkov@linaro.org> References: <20220708131333.2836900-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Register three UFS symbol clocks (ufs_rx_symbol_0_clk_src, ufs_rx_symbol_1_clk_src ufs_tx_symbol_0_clk_src). Register OF clock provider to let other devices link these clocks through the DT. Signed-off-by: Dmitry Baryshkov --- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c index a2526068232b..f206eb4042bf 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c @@ -1167,6 +1167,55 @@ static int qcom_qmp_phy_ufs_clk_init(struct device *dev, const struct qmp_phy_cf return devm_clk_bulk_get(dev, num, qmp->clks); } +static void phy_clk_release_provider(void *res) +{ + of_clk_del_provider(res); +} + +#define UFS_SYMBOL_CLOCKS 3 + +static int phy_symbols_clk_register(struct qcom_qmp *qmp, struct device_node *np) +{ + struct clk_hw_onecell_data *clk_data; + struct clk_hw *hw; + char name[64]; + int ret; + + clk_data = devm_kzalloc(qmp->dev, struct_size(clk_data, hws, UFS_SYMBOL_CLOCKS), GFP_KERNEL); + clk_data->num = UFS_SYMBOL_CLOCKS; + + snprintf(name, sizeof(name), "%s::rx_symbol_0", dev_name(qmp->dev)); + hw = devm_clk_hw_register_fixed_rate(qmp->dev, name, NULL, 0, 0); + if (IS_ERR(hw)) + return PTR_ERR(hw); + + clk_data->hws[0] = hw; + + snprintf(name, sizeof(name), "%s::rx_symbol_1", dev_name(qmp->dev)); + hw = devm_clk_hw_register_fixed_rate(qmp->dev, name, NULL, 0, 0); + if (IS_ERR(hw)) + return PTR_ERR(hw); + + clk_data->hws[1] = hw; + + snprintf(name, sizeof(name), "%s::tx_symbol_0", dev_name(qmp->dev)); + hw = devm_clk_hw_register_fixed_rate(qmp->dev, name, NULL, 0, 0); + if (IS_ERR(hw)) + return PTR_ERR(hw); + + clk_data->hws[2] = hw; + + ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data); + if (ret) + return ret; + + /* + * Roll a devm action because the clock provider is the child node, but + * the child node is not actually a device. + */ + return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np); +} + static const struct phy_ops qcom_qmp_ufs_ops = { .power_on = qcom_qmp_phy_ufs_enable, .power_off = qcom_qmp_phy_ufs_disable, @@ -1358,6 +1407,13 @@ static int qcom_qmp_phy_ufs_probe(struct platform_device *pdev) goto err_node_put; } + ret = phy_symbols_clk_register(qmp, child); + if (ret) { + dev_err(dev, "failed to create symbol clocks, %d\n", + ret); + goto err_node_put; + } + id++; }