From patchwork Fri Jul 8 13:54:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 588918 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 45FB3CCA481 for ; Fri, 8 Jul 2022 13:54:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237997AbiGHNy4 (ORCPT ); Fri, 8 Jul 2022 09:54:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238357AbiGHNyz (ORCPT ); Fri, 8 Jul 2022 09:54:55 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C1052A43D for ; Fri, 8 Jul 2022 06:54:54 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id m18so18009988lfg.10 for ; Fri, 08 Jul 2022 06:54:54 -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=tllR9CHKoo+1RaUDvcQwzF7LiqVYGALP3A/a/+Asc6x59lxzNkw5PlKJjIfbvWPAWW 9CXmwKDcCfaPJiRqylRUxSywesFV5OQNxe7npy51hKnx45vQavBCLzyiRTpaCkErrz0P HfoAj7Ldxkz7UlDrza0GGMKyJbBaM3d4jB6V08jecF3hw5nDP85nxNzxop3CkYcG21O5 eyLoP2ozjmLaTavfx4PT7YoowAPO3sOsbQQQzRxqqQgeROH0n07V6Mwa0Zwl4/gueiGO uMST0a8iIkM5g9jq+m2aeX0cjsYoTZHk28gKiDQ4D4Bp2hEvNOOFLb/08I/9OcieqO6O X2bQ== 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=CjkE/3/p87BfbRdnUKjmYgG+IVlFz63UTtTuLk5joGdaJ36po0WlNP5p+akM2HMki5 3mFXAUqy95hJ0RwqWv0nYgU97jiTMD1CEYrg3WPot3P/s0WtduSTPKB7j1+rcCMGkftZ 2JrLpwJM41vyosyUi3otmLzE0xCAPyXA8xYYrrbljOoBv3aKDeGhJW3+FE0ak5Nhm13u 02yZOQZc6qsxP3oHmhA7ndmqPj9SZR2BOp5DD0XCdtK5CAA7jDOwCcLh8cBZVQGCuyMN oNKnOiC0XVOEZhH2oPXb7JdrvRJNnmFpvd5TsZHQflCHdRaqbqpHchP0setHLJrhMojV Ytdw== X-Gm-Message-State: AJIora98I0+wgol+Rnyve8nYilkakGMBNJFPrtOMgUiRjmHCTEgGxJoR MEMIKrxnH0t1P2pi6U/NWUlNUdO2L4Vayg== X-Google-Smtp-Source: AGRyM1ueiCl2TJwWKsZU0JOxrMmww4iJVFJmo5yk2nZiJigX7CiUL+rANkwFfa0/dKx/t7m5rW6kcw== X-Received: by 2002:a05:6512:228d:b0:489:2309:fd63 with SMTP id f13-20020a056512228d00b004892309fd63mr2682898lfu.232.1657288492993; Fri, 08 Jul 2022 06:54:52 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y9-20020ac24e69000000b0047f647414efsm7428352lfs.190.2022.07.08.06.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 06:54:52 -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 v3 1/3] clk: asm9260: use new helper for fixed rate clock creation Date: Fri, 8 Jul 2022 16:54:48 +0300 Message-Id: <20220708135450.2845810-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708135450.2845810-1-dmitry.baryshkov@linaro.org> References: <20220708135450.2845810-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:54:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 588621 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 B0D67C433EF for ; Fri, 8 Jul 2022 13:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238360AbiGHNy6 (ORCPT ); Fri, 8 Jul 2022 09:54:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238357AbiGHNy5 (ORCPT ); Fri, 8 Jul 2022 09:54:57 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EAFF2A435 for ; Fri, 8 Jul 2022 06:54:55 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id u14so26050540ljh.2 for ; Fri, 08 Jul 2022 06:54:55 -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=FfCRKrxfUKQKpwbdzPRN+pHx5Kjtdlz5+r1KZuHovMqpH482MpGYPOSlqoPsSokLCr BsTcCnmcLZf/eyagb1g4Bvxi3HTs90S6xrg2s08wFkPxCJrOa2EA9Jh4oDXUo2aypSrR fZNlxTT5dqpyeplGrver+Q8bdZXD0DVgyhSJ3wsce7NE5+PKQu5ziAU4/s+M972daoRg T0CT/N02A2VUDkWSB6AtIIvuMAwvMwMuJ4lgzFIP1V2ZBAmj9tj5rKs7RYZ3duHmSPUn g8XMMY1u2Sb5mso7hY6vH7yOpDwpabwxmZScQU9aDujALc6IjwkM1fLwj0hCkX5nfnuI gsbw== 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=kfijQopwFTGhAqTQewpgLqcflnXU8jJgG+H9yHC6mPuWJyxAdJsRksyip3ktsoo8vH q9dvBuTbJMJxxUXUSqehLjfxoLVtIkymwN2R56zXFQWdPPiFm7C3BYNsj4X1+ZL4oD1O QpAcFfWHIE17QXBo+mSfHoExqu8Whdxu3ZwzsfzbdmyR8bmPa1ipXnH9iMkYyjiQ8YoW 5Lz2x2mKxjJa423GBs+TamhXhLrCSQ8wnAhFYgTQvSRcyKGnXZLddBPM54BMBp4BOOqF KRhU10AO2JLBpT7DlhF/iMg8QWnSZ860aSRXDDy02gQwJUxkQAew65FZ9pu5KL+7VQLQ hH1A== X-Gm-Message-State: AJIora/OEp+YYt5C3OH5UGSZmJISnanTDC13oY8xkrHV+u2LBLyUwpAa 3ykmkGKpwCQJsJT0W5a87tkc5w== X-Google-Smtp-Source: AGRyM1stZOiDpeg6tjdPHR8914m7obHodtyvPGHBfcL42/nIqKRnx1ON/2CjCiqvRzpj8pm8NhjVFA== X-Received: by 2002:a2e:a7c7:0:b0:25b:b72d:aa3c with SMTP id x7-20020a2ea7c7000000b0025bb72daa3cmr2067238ljp.318.1657288493987; Fri, 08 Jul 2022 06:54:53 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y9-20020ac24e69000000b0047f647414efsm7428352lfs.190.2022.07.08.06.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 06:54:53 -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 v3 2/3] clk: fixed-rate: add devm_clk_hw_register_fixed_rate Date: Fri, 8 Jul 2022 16:54:49 +0300 Message-Id: <20220708135450.2845810-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708135450.2845810-1-dmitry.baryshkov@linaro.org> References: <20220708135450.2845810-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:54:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 588917 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 490F2CCA482 for ; Fri, 8 Jul 2022 13:54:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238357AbiGHNy6 (ORCPT ); Fri, 8 Jul 2022 09:54:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238359AbiGHNy5 (ORCPT ); Fri, 8 Jul 2022 09:54:57 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7454F2A701 for ; Fri, 8 Jul 2022 06:54:56 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id o7so7338787lfq.9 for ; Fri, 08 Jul 2022 06:54:56 -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=3F2kWbK89xXlF4GcpyJZ3T9LLi937X/DX8TG7c54mes=; b=YfhPmY1lxpfF3umqnpJhY5W/QvXwHHvo6+1tNvJN8m5obPzTPNmim4Ht/FVBHiwM+U X59wV7NXk1oq6jeBxerK+LiLIzXK4pKVehrIsPpiFp+vNtrSTYFUplgnR7Hu932Ake2Z vp/pxnKW7VUoupsZVPRCZDgo0om90eew6P8kB4JQFogUh8ohvj0DptZM+BC2btE2/8He 8KMpTARypcWDymOZ2MtBF+tc1TpsyEocHb+BMShL1eDVHGw04rHKcj3sq4J9x6517ocX BDqvwSr9av+RipifIBuKxSXU9d3B0RhZ5f5bxmU2LhyElpsySaO7B6Kn9DBwdxvrKMRq r9+g== 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=3F2kWbK89xXlF4GcpyJZ3T9LLi937X/DX8TG7c54mes=; b=DimRNkNkJ0JryeXB9FnbaWTL1UhhU/9N4NZiyQiMgHNJ+9phhDClqKoypJ414ksdiL 3WZI6t5bJVwcNUX+QEpyieIXp59RxBB9oXsW8m990aDLUKb3943ymmbXEDKXi7VdcvMT QI4k/uuaUydNJ9c9PP7Cr0gFN86liIRdc90zffySIz/v166FNmEw7SVa5QRD4LzlQr51 BwJC2IrMc6SiziiJRY3+luf8pMmyqOp6Z/XDPoXcHGWu1nF9oLJmehD458DKZs5T1R69 3+wt9vpFKZ2Nb/B1yx8hiiMYf6oo5+Z+JBwVILdx1yenm9QxFlZ53tTn9cd4pQ7hshE0 jEVQ== X-Gm-Message-State: AJIora8S/gb7q/QV6ydRsxw0fft6sVEQLP7uPPTbO2NcVqL3BT7Bnrsk K8Bwy3wnJkF8KsWmsr2eOAGgSQ== X-Google-Smtp-Source: AGRyM1to0Q2VwX89QXXfoCAlbGDQZbPwbzrhHmX9Yjh4fb6sP+/QxuL/KswcYmJN1ub9aKqNi+cksg== X-Received: by 2002:a05:6512:220c:b0:483:d9ad:b56c with SMTP id h12-20020a056512220c00b00483d9adb56cmr2542708lfu.150.1657288494842; Fri, 08 Jul 2022 06:54:54 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id y9-20020ac24e69000000b0047f647414efsm7428352lfs.190.2022.07.08.06.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 06:54:54 -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 v3 3/3] phy: qcom-qmp-ufs: provide symbol clocks Date: Fri, 8 Jul 2022 16:54:50 +0300 Message-Id: <20220708135450.2845810-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708135450.2845810-1-dmitry.baryshkov@linaro.org> References: <20220708135450.2845810-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 | 59 +++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c index a2526068232b..e0a952591eb0 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c @@ -1167,6 +1167,58 @@ 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); + if (!clk_data) + return -ENOMEM; + + 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 +1410,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++; }