From: Abel Vesa <abel.vesa@linaro.org>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@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 3/8] clk: qcom: rpmh: drop all _ao names
Date: Thu, 1 Dec 2022 22:37:07 +0200 [thread overview]
Message-ID: <Y4kQc82F7kgpBlI9@linaro.org> (raw)
In-Reply-To: <20221130131001.20912-4-dmitry.baryshkov@linaro.org>
On 22-11-30 15:09:56, Dmitry Baryshkov wrote:
> In preparation for the further cleanup, remove the active only names,
> they can be easily generated from the standard ones.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
I was actually thinking of this when worked on SM8550. Thanks for doing it.
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
> ---
> drivers/clk/qcom/clk-rpmh.c | 62 ++++++++++++++++++-------------------
> 1 file changed, 30 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> index c4852bbd00bf..00c0c8f851bd 100644
> --- a/drivers/clk/qcom/clk-rpmh.c
> +++ b/drivers/clk/qcom/clk-rpmh.c
> @@ -70,15 +70,15 @@ struct clk_rpmh_desc {
>
> static DEFINE_MUTEX(rpmh_clk_lock);
>
> -#define __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \
> +#define __DEFINE_CLK_RPMH(_platform, _name, _res_name, \
> _res_en_offset, _res_on, _div) \
> - static struct clk_rpmh _platform##_##_name_active; \
> + static struct clk_rpmh _platform##_##_name##_ao; \
> static struct clk_rpmh _platform##_##_name = { \
> .res_name = _res_name, \
> .res_addr = _res_en_offset, \
> .res_on_val = _res_on, \
> .div = _div, \
> - .peer = &_platform##_##_name_active, \
> + .peer = &_platform##_##_name##_ao, \
> .valid_state_mask = (BIT(RPMH_WAKE_ONLY_STATE) | \
> BIT(RPMH_ACTIVE_ONLY_STATE) | \
> BIT(RPMH_SLEEP_STATE)), \
> @@ -92,7 +92,7 @@ static DEFINE_MUTEX(rpmh_clk_lock);
> .num_parents = 1, \
> }, \
> }; \
> - static struct clk_rpmh _platform##_##_name_active = { \
> + static struct clk_rpmh _platform##_##_name##_ao= { \
> .res_name = _res_name, \
> .res_addr = _res_en_offset, \
> .res_on_val = _res_on, \
> @@ -102,7 +102,7 @@ static DEFINE_MUTEX(rpmh_clk_lock);
> BIT(RPMH_ACTIVE_ONLY_STATE)), \
> .hw.init = &(struct clk_init_data){ \
> .ops = &clk_rpmh_ops, \
> - .name = #_name_active, \
> + .name = #_name "_ao", \
> .parent_data = &(const struct clk_parent_data){ \
> .fw_name = "xo", \
> .name = "xo_board", \
> @@ -111,14 +111,12 @@ static DEFINE_MUTEX(rpmh_clk_lock);
> }, \
> }
>
> -#define DEFINE_CLK_RPMH_ARC(_platform, _name, _name_active, _res_name, \
> - _res_on, _div) \
> - __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \
> +#define DEFINE_CLK_RPMH_ARC(_platform, _name, _res_name, _res_on, _div) \
> + __DEFINE_CLK_RPMH(_platform, _name, _res_name, \
> CLK_RPMH_ARC_EN_OFFSET, _res_on, _div)
>
> -#define DEFINE_CLK_RPMH_VRM(_platform, _name, _name_active, _res_name, \
> - _div) \
> - __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \
> +#define DEFINE_CLK_RPMH_VRM(_platform, _name, _res_name, _div) \
> + __DEFINE_CLK_RPMH(_platform, _name, _res_name, \
> CLK_RPMH_VRM_EN_OFFSET, 1, _div)
>
> #define DEFINE_CLK_RPMH_BCM(_platform, _name, _res_name) \
> @@ -342,33 +340,33 @@ static const struct clk_ops clk_rpmh_bcm_ops = {
> };
>
> /* Resource name must match resource id present in cmd-db */
> -DEFINE_CLK_RPMH_ARC(qdu1000, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 1);
> -DEFINE_CLK_RPMH_ARC(sdm845, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 2);
> -DEFINE_CLK_RPMH_ARC(sc7280, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 4);
> -DEFINE_CLK_RPMH_ARC(sm6350, qlink, qlink_ao, "qphy.lvl", 0x1, 4);
> +DEFINE_CLK_RPMH_ARC(qdu1000, bi_tcxo, "xo.lvl", 0x3, 1);
> +DEFINE_CLK_RPMH_ARC(sdm845, bi_tcxo, "xo.lvl", 0x3, 2);
> +DEFINE_CLK_RPMH_ARC(sc7280, bi_tcxo, "xo.lvl", 0x3, 4);
> +DEFINE_CLK_RPMH_ARC(sm6350, qlink, "qphy.lvl", 0x1, 4);
>
> -DEFINE_CLK_RPMH_VRM(sm8250, ln_bb_clk1, ln_bb_clk1_ao, "lnbclka1", 2);
> -DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk2, ln_bb_clk2_ao, "lnbclka2", 2);
> -DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk3, ln_bb_clk3_ao, "lnbclka3", 2);
> +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(sm8450, ln_bb_clk1, ln_bb_clk1_ao, "lnbclka1", 4);
> -DEFINE_CLK_RPMH_VRM(sm8450, ln_bb_clk2, ln_bb_clk2_ao, "lnbclka2", 4);
> +DEFINE_CLK_RPMH_VRM(sm8450, ln_bb_clk1, "lnbclka1", 4);
> +DEFINE_CLK_RPMH_VRM(sm8450, ln_bb_clk2, "lnbclka2", 4);
>
> -DEFINE_CLK_RPMH_VRM(sm6350, ln_bb_clk2, ln_bb_clk2_ao, "lnbclkg2", 4);
> -DEFINE_CLK_RPMH_VRM(sm6350, ln_bb_clk3, ln_bb_clk3_ao, "lnbclkg3", 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(sdm845, rf_clk1, rf_clk1_ao, "rfclka1", 1);
> -DEFINE_CLK_RPMH_VRM(sdm845, rf_clk2, rf_clk2_ao, "rfclka2", 1);
> -DEFINE_CLK_RPMH_VRM(sdm845, rf_clk3, rf_clk3_ao, "rfclka3", 1);
> -DEFINE_CLK_RPMH_VRM(sm8350, rf_clk4, rf_clk4_ao, "rfclka4", 1);
> -DEFINE_CLK_RPMH_VRM(sm8350, rf_clk5, rf_clk5_ao, "rfclka5", 1);
> +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(sc8180x, rf_clk1, rf_clk1_ao, "rfclkd1", 1);
> -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk2, rf_clk2_ao, "rfclkd2", 1);
> -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk3, rf_clk3_ao, "rfclkd3", 1);
> -DEFINE_CLK_RPMH_VRM(sc8180x, rf_clk4, rf_clk4_ao, "rfclkd4", 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(sm8350, div_clk1, div_clk1_ao, "divclka1", 2);
> +DEFINE_CLK_RPMH_VRM(sm8350, div_clk1, "divclka1", 2);
>
> DEFINE_CLK_RPMH_BCM(sdm845, ipa, "IP0");
> DEFINE_CLK_RPMH_BCM(sdm845, ce, "CE0");
> --
> 2.35.1
>
next prev parent reply other threads:[~2022-12-01 20:37 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 [this message]
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
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=Y4kQc82F7kgpBlI9@linaro.org \
--to=abel.vesa@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox