From mboxrd@z Thu Jan 1 00:00:00 1970 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 EBF38C43217 for ; Thu, 1 Dec 2022 19:21:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbiLATVV (ORCPT ); Thu, 1 Dec 2022 14:21:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229847AbiLATVT (ORCPT ); Thu, 1 Dec 2022 14:21:19 -0500 Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AC43C5E35 for ; Thu, 1 Dec 2022 11:21:17 -0800 (PST) Received: by mail-qt1-x82a.google.com with SMTP id h16so2170491qtu.2 for ; Thu, 01 Dec 2022 11:21:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=qfWL+mZpPAUhTfhp1sZQbhp//vBNWktZGRiiRPanwhg=; b=sMlwTMQjjxptbVk6OVaaa29t7eTObKi5592rFbalBAt5mh8VbjHgUu7G5dBTjHIkI9 rlYiBbdTNhXeGOnHEo0no/vZMT4CIyRuv2F94Kq9n1TruYdxBOUhgYnOYMlcInjnpYam GfZfqFYKxH95eh4IPL5o8uwJQ8SQ5cSARgrUm+QnSO3VE+23MmbT9DhmiYNrjxWU9sDt KjCTlhi+9ReTykdl/I49NGhlzVW3hSkvL1ZRs9HLjuTOPGlS15K77LPHzfA7Bp5BXHrm StEYJXm8PiLOmoUcX0bUgpn7TqkzItGOtbgJeysLFstKqxroUZRWCUbWQ/W9daytQ2WG 8x9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qfWL+mZpPAUhTfhp1sZQbhp//vBNWktZGRiiRPanwhg=; b=LvAb1Bn/V6LFctugqLfnOsBLlX1WTwA6ZhVB1ZV8qGXjGeQylG2D2ozqoVU6ii26zT wc4kqm6V56ss6YLfA0420FQL/XtUcGeKSkMW3Ac9IBI81R0CPh/OqoQqiwsnud3vLrDe VqKAvlyUa/ekpgKwyMvmBiSYH4CPDssOKxgqx0O4rpcFEQY8QVtpPfzN3J/wT12nHkgX NmRir2uDHuV4BT8+2EqhTDPTBxY+QZCHq7E/5+9OWSR58eg7CRArp1wR75RmXHxlU8O4 M+EqgMPWLPTmeuEBo39KRPZBDSrXwXayTPqaksW/K+HrYCn8HeBeFRNupeY23OtTLxpf ZnIA== X-Gm-Message-State: ANoB5pkhKmzCxfndsSjkmRWsHjBot9P8nqSOaShfuVeNsgDV/VzBlxQR CzGdDX0bG9vDo6BgE3g6UTdq/w== X-Google-Smtp-Source: AA0mqf7cCOcYOYwo8/PNWp0oUeamuYGvAqkdAsq77UPUAqY3dCzmxBATwF0j6Iexv7s722cgrkix8w== X-Received: by 2002:a05:622a:4889:b0:3a5:6854:32fe with SMTP id fc9-20020a05622a488900b003a5685432femr63472051qtb.655.1669922476148; Thu, 01 Dec 2022 11:21:16 -0800 (PST) Received: from [172.22.22.4] ([98.61.227.136]) by smtp.googlemail.com with ESMTPSA id j6-20020a05620a288600b006fc7302cf89sm4134164qkp.28.2022.12.01.11.21.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Dec 2022 11:21:15 -0800 (PST) Message-ID: Date: Thu, 1 Dec 2022 13:21:14 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 6/8] clk: qcom: rpmh: rename VRM clock data Content-Language: en-US To: Dmitry Baryshkov , Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Taniya Das Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org References: <20221130131001.20912-1-dmitry.baryshkov@linaro.org> <20221130131001.20912-7-dmitry.baryshkov@linaro.org> From: Alex Elder In-Reply-To: <20221130131001.20912-7-dmitry.baryshkov@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org On 11/30/22 7:09 AM, Dmitry Baryshkov wrote: > RPMH VRM clocks are frequently shared between several platfoms. It makes > little sense to encode the SoC name into the clock name, if the same > clock is used for other SoCs. > > Rework the VRM clocks defintions to remove the SoC name. Keep the s/clocks defintions/clock definitions/ > userspace-visible clock name, but encode the part of cmd resource and > the divider into the variable name. This also make it obvious which > variant is used, making the code less error-prone. Like my other suggestion on the user visible name, I think you could probably do all clock types at once if you eliminated the platform type in favor of using clk_rpmh_ in all symbols in one patch. The result might be easier to follow. I might be mistaken though--I haven't tried it and there could be something that complicates that. Anyway, other than that suggestion this looks good. -Alex > Signed-off-by: Dmitry Baryshkov > --- > drivers/clk/qcom/clk-rpmh.c | 258 ++++++++++++++++++------------------ > 1 file changed, 129 insertions(+), 129 deletions(-) > > diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c > index bd6cb07b6154..dcac84614b06 100644 > --- a/drivers/clk/qcom/clk-rpmh.c > +++ b/drivers/clk/qcom/clk-rpmh.c > @@ -115,8 +115,8 @@ static DEFINE_MUTEX(rpmh_clk_lock); > __DEFINE_CLK_RPMH(clk_rpmh, _name, _name##_##div##_div, _res_name, \ > CLK_RPMH_ARC_EN_OFFSET, _res_on, _div) > > -#define DEFINE_CLK_RPMH_VRM(_platform, _name, _res_name, _div) \ > - __DEFINE_CLK_RPMH(_platform, _name, _name, _res_name, \ > +#define DEFINE_CLK_RPMH_VRM(_name, _suffix, _res_name, _div) \ > + __DEFINE_CLK_RPMH(clk_rpmh, _name, _name##_suffix, _res_name, \ > CLK_RPMH_VRM_EN_OFFSET, 1, _div) > > #define DEFINE_CLK_RPMH_BCM(_name, _res_name) \ > @@ -345,28 +345,28 @@ DEFINE_CLK_RPMH_ARC(bi_tcxo, "xo.lvl", 0x3, 2); > DEFINE_CLK_RPMH_ARC(bi_tcxo, "xo.lvl", 0x3, 4); > DEFINE_CLK_RPMH_ARC(qlink, "qphy.lvl", 0x1, 4); > > -DEFINE_CLK_RPMH_VRM(sm8250, ln_bb_clk1, "lnbclka1", 2); > -DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk2, "lnbclka2", 2); > -DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk3, "lnbclka3", 2); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2, "lnbclka1", 2); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2, "lnbclka2", 2); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2, "lnbclka3", 2); > > -DEFINE_CLK_RPMH_VRM(sm8450, ln_bb_clk1, "lnbclka1", 4); > -DEFINE_CLK_RPMH_VRM(sm8450, ln_bb_clk2, "lnbclka2", 4); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a4, "lnbclka1", 4); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a4, "lnbclka2", 4); > > -DEFINE_CLK_RPMH_VRM(sm6350, ln_bb_clk2, "lnbclkg2", 4); > -DEFINE_CLK_RPMH_VRM(sm6350, ln_bb_clk3, "lnbclkg3", 4); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _g4, "lnbclkg2", 4); > +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _g4, "lnbclkg3", 4); > > -DEFINE_CLK_RPMH_VRM(sdm845, rf_clk1, "rfclka1", 1); > -DEFINE_CLK_RPMH_VRM(sdm845, rf_clk2, "rfclka2", 1); > -DEFINE_CLK_RPMH_VRM(sdm845, rf_clk3, "rfclka3", 1); > -DEFINE_CLK_RPMH_VRM(sm8350, rf_clk4, "rfclka4", 1); > -DEFINE_CLK_RPMH_VRM(sm8350, rf_clk5, "rfclka5", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk1, _a, "rfclka1", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk2, _a, "rfclka2", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk3, _a, "rfclka3", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk4, _a, "rfclka4", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk5, _a, "rfclka5", 1); > > -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk1, "rfclkd1", 1); > -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk2, "rfclkd2", 1); > -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk3, "rfclkd3", 1); > -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk4, "rfclkd4", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk1, _d, "rfclkd1", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk2, _d, "rfclkd2", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk3, _d, "rfclkd3", 1); > +DEFINE_CLK_RPMH_VRM(rf_clk4, _d, "rfclkd4", 1); > > -DEFINE_CLK_RPMH_VRM(sm8350, div_clk1, "divclka1", 2); > +DEFINE_CLK_RPMH_VRM(div_clk1, _div2, "divclka1", 2); > > DEFINE_CLK_RPMH_BCM(ipa, "IP0"); > DEFINE_CLK_RPMH_BCM(ce, "CE0"); > @@ -377,16 +377,16 @@ DEFINE_CLK_RPMH_BCM(hwkm, "HK0"); > static struct clk_hw *sdm845_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > [RPMH_CE_CLK] = &clk_rpmh_ce.hw, > }; > @@ -399,14 +399,14 @@ static const struct clk_rpmh_desc clk_rpmh_sdm845 = { > static struct clk_hw *sdm670_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > [RPMH_CE_CLK] = &clk_rpmh_ce.hw, > }; > @@ -419,10 +419,10 @@ static const struct clk_rpmh_desc clk_rpmh_sdm670 = { > static struct clk_hw *sdx55_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_RF_CLK1] = &sc8180x_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sc8180x_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sc8180x_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sc8180x_rf_clk2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_d.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_d_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_d.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_d_ao.hw, > [RPMH_QPIC_CLK] = &clk_rpmh_qpic_clk.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > }; > @@ -435,16 +435,16 @@ static const struct clk_rpmh_desc clk_rpmh_sdx55 = { > static struct clk_hw *sm8150_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > }; > > static const struct clk_rpmh_desc clk_rpmh_sm8150 = { > @@ -455,14 +455,14 @@ static const struct clk_rpmh_desc clk_rpmh_sm8150 = { > static struct clk_hw *sc7180_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > }; > > @@ -474,16 +474,16 @@ static const struct clk_rpmh_desc clk_rpmh_sc7180 = { > static struct clk_hw *sc8180x_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > - [RPMH_RF_CLK1] = &sc8180x_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sc8180x_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sc8180x_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sc8180x_rf_clk2_ao.hw, > - [RPMH_RF_CLK3] = &sc8180x_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sc8180x_rf_clk3_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_d.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_d_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_d.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_d_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_d.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_d_ao.hw, > }; > > static const struct clk_rpmh_desc clk_rpmh_sc8180x = { > @@ -494,16 +494,16 @@ static const struct clk_rpmh_desc clk_rpmh_sc8180x = { > static struct clk_hw *sm8250_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK1] = &sm8250_ln_bb_clk1.hw, > - [RPMH_LN_BB_CLK1_A] = &sm8250_ln_bb_clk1_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2.hw, > + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > }; > > static const struct clk_rpmh_desc clk_rpmh_sm8250 = { > @@ -514,20 +514,20 @@ static const struct clk_rpmh_desc clk_rpmh_sm8250 = { > static struct clk_hw *sm8350_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_DIV_CLK1] = &sm8350_div_clk1.hw, > - [RPMH_DIV_CLK1_A] = &sm8350_div_clk1_ao.hw, > - [RPMH_LN_BB_CLK1] = &sm8250_ln_bb_clk1.hw, > - [RPMH_LN_BB_CLK1_A] = &sm8250_ln_bb_clk1_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > - [RPMH_RF_CLK4] = &sm8350_rf_clk4.hw, > - [RPMH_RF_CLK4_A] = &sm8350_rf_clk4_ao.hw, > - [RPMH_RF_CLK5] = &sm8350_rf_clk5.hw, > - [RPMH_RF_CLK5_A] = &sm8350_rf_clk5_ao.hw, > + [RPMH_DIV_CLK1] = &clk_rpmh_div_clk1_div2.hw, > + [RPMH_DIV_CLK1_A] = &clk_rpmh_div_clk1_div2_ao.hw, > + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2.hw, > + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a.hw, > + [RPMH_RF_CLK4_A] = &clk_rpmh_rf_clk4_a_ao.hw, > + [RPMH_RF_CLK5] = &clk_rpmh_rf_clk5_a.hw, > + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > [RPMH_PKA_CLK] = &clk_rpmh_pka.hw, > [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw, > @@ -541,8 +541,8 @@ static const struct clk_rpmh_desc clk_rpmh_sm8350 = { > static struct clk_hw *sc8280xp_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > [RPMH_PKA_CLK] = &clk_rpmh_pka.hw, > [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw, > @@ -556,18 +556,18 @@ static const struct clk_rpmh_desc clk_rpmh_sc8280xp = { > static struct clk_hw *sm8450_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div4.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div4_ao.hw, > - [RPMH_LN_BB_CLK1] = &sm8450_ln_bb_clk1.hw, > - [RPMH_LN_BB_CLK1_A] = &sm8450_ln_bb_clk1_ao.hw, > - [RPMH_LN_BB_CLK2] = &sm8450_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sm8450_ln_bb_clk2_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > - [RPMH_RF_CLK4] = &sm8350_rf_clk4.hw, > - [RPMH_RF_CLK4_A] = &sm8350_rf_clk4_ao.hw, > + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a4.hw, > + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a4_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a4.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a4_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a.hw, > + [RPMH_RF_CLK4_A] = &clk_rpmh_rf_clk4_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > }; > > @@ -579,14 +579,14 @@ static const struct clk_rpmh_desc clk_rpmh_sm8450 = { > static struct clk_hw *sc7280_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div4.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div4_ao.hw, > - [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > - [RPMH_RF_CLK4] = &sm8350_rf_clk4.hw, > - [RPMH_RF_CLK4_A] = &sm8350_rf_clk4_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a.hw, > + [RPMH_RF_CLK4_A] = &clk_rpmh_rf_clk4_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > [RPMH_PKA_CLK] = &clk_rpmh_pka.hw, > [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw, > @@ -600,10 +600,10 @@ static const struct clk_rpmh_desc clk_rpmh_sc7280 = { > static struct clk_hw *sm6350_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div4.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div4_ao.hw, > - [RPMH_LN_BB_CLK2] = &sm6350_ln_bb_clk2.hw, > - [RPMH_LN_BB_CLK2_A] = &sm6350_ln_bb_clk2_ao.hw, > - [RPMH_LN_BB_CLK3] = &sm6350_ln_bb_clk3.hw, > - [RPMH_LN_BB_CLK3_A] = &sm6350_ln_bb_clk3_ao.hw, > + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_g4.hw, > + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_g4_ao.hw, > + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_g4.hw, > + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_g4_ao.hw, > [RPMH_QLINK_CLK] = &clk_rpmh_qlink_div4.hw, > [RPMH_QLINK_CLK_A] = &clk_rpmh_qlink_div4_ao.hw, > }; > @@ -616,16 +616,16 @@ static const struct clk_rpmh_desc clk_rpmh_sm6350 = { > static struct clk_hw *sdx65_rpmh_clocks[] = { > [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div4.hw, > [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div4_ao.hw, > - [RPMH_LN_BB_CLK1] = &sm8450_ln_bb_clk1.hw, > - [RPMH_LN_BB_CLK1_A] = &sm8450_ln_bb_clk1_ao.hw, > - [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, > - [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, > - [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, > - [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, > - [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, > - [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, > - [RPMH_RF_CLK4] = &sm8350_rf_clk4.hw, > - [RPMH_RF_CLK4_A] = &sm8350_rf_clk4_ao.hw, > + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a4.hw, > + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a4_ao.hw, > + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a.hw, > + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, > + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, > + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, > + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, > + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, > + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a.hw, > + [RPMH_RF_CLK4_A] = &clk_rpmh_rf_clk4_a_ao.hw, > [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, > [RPMH_QPIC_CLK] = &clk_rpmh_qpic_clk.hw, > };