From: Bjorn Andersson <andersson@kernel.org>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Taniya Das <quic_tdas@quicinc.com>,
linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
Alex Elder <elder@linaro.org>
Subject: Re: [PATCH v2 4/8] clk: qcom: rpmh: remove platform names from BCM clocks
Date: Thu, 1 Dec 2022 17:22:40 -0600 [thread overview]
Message-ID: <20221201232240.7luz2hfsao345o6v@builder.lan> (raw)
In-Reply-To: <20221130131001.20912-5-dmitry.baryshkov@linaro.org>
On Wed, Nov 30, 2022 at 03:09:57PM +0200, Dmitry Baryshkov wrote:
> There are no platform-specific parts in the BCM clocks, drop the
> platform name from the clock definitions, replacing it with clk_rpmh to
> have the common prefix.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> drivers/clk/qcom/clk-rpmh.c | 52 ++++++++++++++++++-------------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> index 00c0c8f851bd..5044f9fa156d 100644
> --- a/drivers/clk/qcom/clk-rpmh.c
> +++ b/drivers/clk/qcom/clk-rpmh.c
> @@ -119,8 +119,8 @@ static DEFINE_MUTEX(rpmh_clk_lock);
> __DEFINE_CLK_RPMH(_platform, _name, _res_name, \
> CLK_RPMH_VRM_EN_OFFSET, 1, _div)
>
> -#define DEFINE_CLK_RPMH_BCM(_platform, _name, _res_name) \
> - static struct clk_rpmh _platform##_##_name = { \
> +#define DEFINE_CLK_RPMH_BCM(_name, _res_name) \
> + static struct clk_rpmh clk_rpmh_##_name = { \
> .res_name = _res_name, \
> .valid_state_mask = BIT(RPMH_ACTIVE_ONLY_STATE), \
> .div = 1, \
> @@ -368,11 +368,11 @@ DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk4, "rfclkd4", 1);
>
> DEFINE_CLK_RPMH_VRM(sm8350, div_clk1, "divclka1", 2);
>
> -DEFINE_CLK_RPMH_BCM(sdm845, ipa, "IP0");
> -DEFINE_CLK_RPMH_BCM(sdm845, ce, "CE0");
> -DEFINE_CLK_RPMH_BCM(sdx55, qpic_clk, "QP0");
> -DEFINE_CLK_RPMH_BCM(sm8350, pka, "PKA0");
> -DEFINE_CLK_RPMH_BCM(sm8350, hwkm, "HK0");
> +DEFINE_CLK_RPMH_BCM(ipa, "IP0");
> +DEFINE_CLK_RPMH_BCM(ce, "CE0");
> +DEFINE_CLK_RPMH_BCM(qpic_clk, "QP0");
> +DEFINE_CLK_RPMH_BCM(pka, "PKA0");
> +DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
Would you mind sorting these alphabetically?
Thanks for cleaning this up!
Bjorn
>
> static struct clk_hw *sdm845_rpmh_clocks[] = {
> [RPMH_CXO_CLK] = &sdm845_bi_tcxo.hw,
> @@ -387,8 +387,8 @@ static struct clk_hw *sdm845_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> - [RPMH_CE_CLK] = &sdm845_ce.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> + [RPMH_CE_CLK] = &clk_rpmh_ce.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sdm845 = {
> @@ -407,8 +407,8 @@ static struct clk_hw *sdm670_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> - [RPMH_CE_CLK] = &sdm845_ce.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> + [RPMH_CE_CLK] = &clk_rpmh_ce.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sdm670 = {
> @@ -423,8 +423,8 @@ static struct clk_hw *sdx55_rpmh_clocks[] = {
> [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_QPIC_CLK] = &sdx55_qpic_clk.hw,
> - [RPMH_IPA_CLK] = &sdm845_ipa.hw,
> + [RPMH_QPIC_CLK] = &clk_rpmh_qpic_clk.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sdx55 = {
> @@ -463,7 +463,7 @@ static struct clk_hw *sc7180_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sc7180 = {
> @@ -528,9 +528,9 @@ static struct clk_hw *sm8350_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> - [RPMH_PKA_CLK] = &sm8350_pka.hw,
> - [RPMH_HWKM_CLK] = &sm8350_hwkm.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> + [RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
> + [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sm8350 = {
> @@ -543,9 +543,9 @@ static struct clk_hw *sc8280xp_rpmh_clocks[] = {
> [RPMH_CXO_CLK_A] = &sdm845_bi_tcxo_ao.hw,
> [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw,
> [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw,
> - [RPMH_IPA_CLK] = &sdm845_ipa.hw,
> - [RPMH_PKA_CLK] = &sm8350_pka.hw,
> - [RPMH_HWKM_CLK] = &sm8350_hwkm.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> + [RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
> + [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sc8280xp = {
> @@ -568,7 +568,7 @@ static struct clk_hw *sm8450_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sm8450 = {
> @@ -587,9 +587,9 @@ static struct clk_hw *sc7280_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> - [RPMH_PKA_CLK] = &sm8350_pka.hw,
> - [RPMH_HWKM_CLK] = &sm8350_hwkm.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> + [RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
> + [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sc7280 = {
> @@ -626,8 +626,8 @@ static struct clk_hw *sdx65_rpmh_clocks[] = {
> [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_IPA_CLK] = &sdm845_ipa.hw,
> - [RPMH_QPIC_CLK] = &sdx55_qpic_clk.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> + [RPMH_QPIC_CLK] = &clk_rpmh_qpic_clk.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sdx65 = {
> --
> 2.35.1
>
next prev parent reply other threads:[~2022-12-01 23:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 13:09 [PATCH v2 0/8] clk: qcom: rpm/rpmh: drop platform names Dmitry Baryshkov
2022-11-30 13:09 ` [PATCH v2 1/8] clk: qcom: rpmh: group clock definitions together Dmitry Baryshkov
2022-11-30 13:09 ` [PATCH v2 2/8] clk: qcom: rpmh: reuse common duplicate clocks Dmitry Baryshkov
2022-11-30 13:09 ` [PATCH v2 3/8] clk: qcom: rpmh: drop all _ao names Dmitry Baryshkov
2022-11-30 13:22 ` Konrad Dybcio
2022-12-01 19:20 ` Alex Elder
2022-12-01 20:37 ` Abel Vesa
2022-11-30 13:09 ` [PATCH v2 4/8] clk: qcom: rpmh: remove platform names from BCM clocks Dmitry Baryshkov
2022-11-30 13:23 ` Konrad Dybcio
2022-12-01 19:20 ` Alex Elder
2022-12-01 23:22 ` Bjorn Andersson [this message]
2022-12-02 6:39 ` Dmitry Baryshkov
2022-11-30 13:09 ` [PATCH v2 5/8] clk: qcom: rpmh: rename ARC clock data Dmitry Baryshkov
2022-12-01 19:21 ` Alex Elder
2022-11-30 13:09 ` [PATCH v2 6/8] clk: qcom: rpmh: rename VRM " Dmitry Baryshkov
2022-11-30 13:30 ` Konrad Dybcio
2022-12-01 19:21 ` Alex Elder
2022-11-30 13:10 ` [PATCH v2 7/8] clk: qcom: rpmh: remove the last traces of the platform usage Dmitry Baryshkov
2022-11-30 13:26 ` Konrad Dybcio
2022-12-01 19:21 ` Alex Elder
2022-11-30 13:10 ` [PATCH v2 8/8] clk: qcom: rpm: drop the platform from clock definitions Dmitry Baryshkov
2022-11-30 13:28 ` Konrad Dybcio
2022-12-01 19:21 ` Alex Elder
2022-12-01 20:24 ` Dmitry Baryshkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221201232240.7luz2hfsao345o6v@builder.lan \
--to=andersson@kernel.org \
--cc=agross@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=elder@linaro.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=quic_tdas@quicinc.com \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.