Add the RPMH clocks present in Kaanapali SoC.
Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
---
drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
+DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
+DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
+DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
+
+DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
+DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
+
+DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
+DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
+DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
+
+DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
+
DEFINE_CLK_RPMH_BCM(ce, "CE0");
DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
DEFINE_CLK_RPMH_BCM(ipa, "IP0");
@@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
.num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
};
+static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
+ [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
+ [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
+ [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
+ [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
+ [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
+ [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
+ [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
+ [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
+ [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
+ [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
+ [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
+ [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
+ [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
+ [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
+ [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
+ [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
+};
+
+static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
+ .clks = kaanapali_rpmh_clocks,
+ .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
+};
+
static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
void *data)
{
@@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
static const struct of_device_id clk_rpmh_match_table[] = {
{ .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
+ { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
{ .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
{ .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
{ .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
--
2.34.1
On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote:
> Add the RPMH clocks present in Kaanapali SoC.
>
> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
> ---
> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
> --- a/drivers/clk/qcom/clk-rpmh.c
> +++ b/drivers/clk/qcom/clk-rpmh.c
> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
>
> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
> +
> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
What is the difference between these clocks and clk[3458] defined few
lines above? Why are they named differently? If the other name is
incorrect, please fix it.
> +
> +DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
> +DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
> +DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
> +
> +DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
> +
> DEFINE_CLK_RPMH_BCM(ce, "CE0");
> DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
> DEFINE_CLK_RPMH_BCM(ipa, "IP0");
> @@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
> .num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
> };
>
> +static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
> + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
> + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
> + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
> + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
> + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
> + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
> + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
> + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
> + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
> + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
> + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
> + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> +};
> +
> +static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
> + .clks = kaanapali_rpmh_clocks,
> + .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
> +};
> +
> static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
> void *data)
> {
> @@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
>
> static const struct of_device_id clk_rpmh_match_table[] = {
> { .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
> + { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
> { .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
> { .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
> { .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
On 11/11/2025 4:16 PM, Dmitry Baryshkov wrote:
> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote:
>> Add the RPMH clocks present in Kaanapali SoC.
>>
>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
>> ---
>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 42 insertions(+)
>>
>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
>> --- a/drivers/clk/qcom/clk-rpmh.c
>> +++ b/drivers/clk/qcom/clk-rpmh.c
>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
>>
>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
>> +
>> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
>> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
>
> What is the difference between these clocks and clk[3458] defined few
> lines above? Why are they named differently? If the other name is
> incorrect, please fix it.
>
Dmitry, my intention was to make a clear distinction between the ‘rf’
clocks and the ‘ln’ clocks. Since there could be overlap in the
numbering, I added prefixes for clarity. I should have applied the same
approach to clk[3458] as well. I will add the fix-up for the same.
>> +
>> +DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
>> +
>> +DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
>> +
>> DEFINE_CLK_RPMH_BCM(ce, "CE0");
>> DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
>> DEFINE_CLK_RPMH_BCM(ipa, "IP0");
>> @@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
>> .num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
>> };
>>
>> +static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
>> + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
>> + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
>> + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
>> + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
>> + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
>> + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
>> + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
>> + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
>> + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
>> + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
>> + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
>> + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
>> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
>> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
>> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
>> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
>> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
>> +};
>> +
>> +static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
>> + .clks = kaanapali_rpmh_clocks,
>> + .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
>> +};
>> +
>> static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
>> void *data)
>> {
>> @@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
>>
>> static const struct of_device_id clk_rpmh_match_table[] = {
>> { .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
>> + { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
>> { .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
>> { .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
>> { .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
>>
>> --
>> 2.34.1
>>
>
--
Thanks,
Taniya Das
On Fri, Nov 14, 2025 at 02:13:49PM +0530, Taniya Das wrote:
>
>
> On 11/11/2025 4:16 PM, Dmitry Baryshkov wrote:
> > On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote:
> >> Add the RPMH clocks present in Kaanapali SoC.
> >>
> >> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
> >> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
> >> ---
> >> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> >> 1 file changed, 42 insertions(+)
> >>
> >> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> >> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
> >> --- a/drivers/clk/qcom/clk-rpmh.c
> >> +++ b/drivers/clk/qcom/clk-rpmh.c
> >> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
> >> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
> >> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
> >>
> >> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
> >> +
> >> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
> >> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
> >
> > What is the difference between these clocks and clk[3458] defined few
> > lines above? Why are they named differently? If the other name is
> > incorrect, please fix it.
> >
>
> Dmitry, my intention was to make a clear distinction between the ‘rf’
> clocks and the ‘ln’ clocks. Since there could be overlap in the
> numbering, I added prefixes for clarity. I should have applied the same
> approach to clk[3458] as well. I will add the fix-up for the same.
Why do we need to distinguish between them here? The resources in CMD-DB
don't have such a difference. You'll select whether the clock is RF or
LN when describing the platform data.
>
> >> +
> >> +DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
> >> +
> >> +DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
> >> +
> >> DEFINE_CLK_RPMH_BCM(ce, "CE0");
> >> DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
> >> DEFINE_CLK_RPMH_BCM(ipa, "IP0");
> >> @@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
> >> .num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
> >> };
> >>
> >> +static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
> >> + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
> >> + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
> >> + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
> >> + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
> >> + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
> >> + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
> >> + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
> >> + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
> >> + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
> >> + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
> >> + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
> >> + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
> >> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
> >> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
> >> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
> >> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
> >> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> >> +};
> >> +
> >> +static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
> >> + .clks = kaanapali_rpmh_clocks,
> >> + .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
> >> +};
> >> +
> >> static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
> >> void *data)
> >> {
> >> @@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
> >>
> >> static const struct of_device_id clk_rpmh_match_table[] = {
> >> { .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
> >> + { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
> >> { .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
> >> { .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
> >> { .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
> >>
> >> --
> >> 2.34.1
> >>
> >
>
> --
> Thanks,
> Taniya Das
>
--
With best wishes
Dmitry
On 11/14/2025 4:38 PM, Dmitry Baryshkov wrote:
> On Fri, Nov 14, 2025 at 02:13:49PM +0530, Taniya Das wrote:
>>
>>
>> On 11/11/2025 4:16 PM, Dmitry Baryshkov wrote:
>>> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote:
>>>> Add the RPMH clocks present in Kaanapali SoC.
>>>>
>>>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
>>>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
>>>> ---
>>>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>>>> 1 file changed, 42 insertions(+)
>>>>
>>>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
>>>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
>>>> --- a/drivers/clk/qcom/clk-rpmh.c
>>>> +++ b/drivers/clk/qcom/clk-rpmh.c
>>>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
>>>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
>>>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
>>>>
>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
>>>> +
>>>> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
>>>> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
>>>
>>> What is the difference between these clocks and clk[3458] defined few
>>> lines above? Why are they named differently? If the other name is
>>> incorrect, please fix it.
>>>
>>
>> Dmitry, my intention was to make a clear distinction between the ‘rf’
>> clocks and the ‘ln’ clocks. Since there could be overlap in the
>> numbering, I added prefixes for clarity. I should have applied the same
>> approach to clk[3458] as well. I will add the fix-up for the same.
>
> Why do we need to distinguish between them here? The resources in CMD-DB
> don't have such a difference. You'll select whether the clock is RF or
> LN when describing the platform data.
>
It is more for readibility and maintain a direct mapping with the PMIC
clock grid. This way we can immediately identify the clock type without
cross-referencing desc as the clock mapping here would indicate the type
of clock. Yes, the CMD-DB name does not reflect anything with the names
here. Please do let me know your suggestion.
>>
>>>> +
>>>> +DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
>>>> +DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
>>>> +DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
>>>> +
>>>> +DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
>>>> +
>>>> DEFINE_CLK_RPMH_BCM(ce, "CE0");
>>>> DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
>>>> DEFINE_CLK_RPMH_BCM(ipa, "IP0");
>>>> @@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
>>>> .num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
>>>> };
>>>>
>>>> +static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
>>>> + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
>>>> + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
>>>> + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
>>>> + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
>>>> + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
>>>> + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
>>>> + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
>>>> + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
>>>> + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
>>>> + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
>>>> + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
>>>> + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
>>>> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
>>>> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
>>>> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
>>>> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
>>>> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
>>>> +};
>>>> +
>>>> +static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
>>>> + .clks = kaanapali_rpmh_clocks,
>>>> + .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
>>>> +};
>>>> +
>>>> static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
>>>> void *data)
>>>> {
>>>> @@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
>>>>
>>>> static const struct of_device_id clk_rpmh_match_table[] = {
>>>> { .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
>>>> + { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
>>>> { .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
>>>> { .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
>>>> { .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
>>>>
>>>> --
>>>> 2.34.1
>>>>
>>>
>>
>> --
>> Thanks,
>> Taniya Das
>>
>
--
Thanks,
Taniya Das
On Mon, Nov 17, 2025 at 01:28:46PM +0530, Taniya Das wrote: > > > On 11/14/2025 4:38 PM, Dmitry Baryshkov wrote: > > On Fri, Nov 14, 2025 at 02:13:49PM +0530, Taniya Das wrote: > >> > >> > >> On 11/11/2025 4:16 PM, Dmitry Baryshkov wrote: > >>> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote: > >>>> Add the RPMH clocks present in Kaanapali SoC. > >>>> > >>>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> > >>>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > >>>> --- > >>>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > >>>> 1 file changed, 42 insertions(+) > >>>> > >>>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c > >>>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644 > >>>> --- a/drivers/clk/qcom/clk-rpmh.c > >>>> +++ b/drivers/clk/qcom/clk-rpmh.c > >>>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1); > >>>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1); > >>>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1); > >>>> > >>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2); > >>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2); > >>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2); > >>>> + > >>>> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1); > >>>> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1); > >>> > >>> What is the difference between these clocks and clk[3458] defined few > >>> lines above? Why are they named differently? If the other name is > >>> incorrect, please fix it. > >>> > >> > >> Dmitry, my intention was to make a clear distinction between the ‘rf’ > >> clocks and the ‘ln’ clocks. Since there could be overlap in the > >> numbering, I added prefixes for clarity. I should have applied the same > >> approach to clk[3458] as well. I will add the fix-up for the same. > > > > Why do we need to distinguish between them here? The resources in CMD-DB > > don't have such a difference. You'll select whether the clock is RF or > > LN when describing the platform data. > > > > It is more for readibility and maintain a direct mapping with the PMIC > clock grid. This way we can immediately identify the clock type without > cross-referencing desc as the clock mapping here would indicate the type > of clock. Yes, the CMD-DB name does not reflect anything with the names > here. Please do let me know your suggestion. I'd prefer if variables reflect CMD-DB resource names rather than the actual clock usage. In the end, platform data does exactly that - it maps usage to CMD-DB resources. Also, if we follow your proposal, we will end up with ln_bb_clk and rf_clk referencing exactly the same resource, causing possible confusion. -- With best wishes Dmitry
On 11/18/2025 10:04 AM, Dmitry Baryshkov wrote: > On Mon, Nov 17, 2025 at 01:28:46PM +0530, Taniya Das wrote: >> >> >> On 11/14/2025 4:38 PM, Dmitry Baryshkov wrote: >>> On Fri, Nov 14, 2025 at 02:13:49PM +0530, Taniya Das wrote: >>>> >>>> >>>> On 11/11/2025 4:16 PM, Dmitry Baryshkov wrote: >>>>> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote: >>>>>> Add the RPMH clocks present in Kaanapali SoC. >>>>>> >>>>>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> >>>>>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >>>>>> --- >>>>>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++ >>>>>> 1 file changed, 42 insertions(+) >>>>>> >>>>>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c >>>>>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644 >>>>>> --- a/drivers/clk/qcom/clk-rpmh.c >>>>>> +++ b/drivers/clk/qcom/clk-rpmh.c >>>>>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1); >>>>>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1); >>>>>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1); >>>>>> >>>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2); >>>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2); >>>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2); >>>>>> + >>>>>> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1); >>>>>> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1); >>>>> >>>>> What is the difference between these clocks and clk[3458] defined few >>>>> lines above? Why are they named differently? If the other name is >>>>> incorrect, please fix it. >>>>> >>>> >>>> Dmitry, my intention was to make a clear distinction between the ‘rf’ >>>> clocks and the ‘ln’ clocks. Since there could be overlap in the >>>> numbering, I added prefixes for clarity. I should have applied the same >>>> approach to clk[3458] as well. I will add the fix-up for the same. >>> >>> Why do we need to distinguish between them here? The resources in CMD-DB >>> don't have such a difference. You'll select whether the clock is RF or >>> LN when describing the platform data. >>> >> >> It is more for readibility and maintain a direct mapping with the PMIC >> clock grid. This way we can immediately identify the clock type without >> cross-referencing desc as the clock mapping here would indicate the type >> of clock. Yes, the CMD-DB name does not reflect anything with the names >> here. Please do let me know your suggestion. > > I'd prefer if variables reflect CMD-DB resource names rather than the > actual clock usage. In the end, platform data does exactly that - it > maps usage to CMD-DB resources. > Actually the grid does not reflect the cmd-db resource name at all, so I do not think that is the right approach. Let me move to completely remove the 'ln' and 'rf' references and refer them to 'clkN'. > Also, if we follow your proposal, we will end up with ln_bb_clk and > rf_clk referencing exactly the same resource, causing possible > confusion. > Sure, Dmitry, I will move to use clkN and remove the suffixes. -- Thanks, Taniya Das
On Tue, Nov 18, 2025 at 10:18:44AM +0530, Taniya Das wrote: > > > On 11/18/2025 10:04 AM, Dmitry Baryshkov wrote: > > On Mon, Nov 17, 2025 at 01:28:46PM +0530, Taniya Das wrote: > >> > >> > >> On 11/14/2025 4:38 PM, Dmitry Baryshkov wrote: > >>> On Fri, Nov 14, 2025 at 02:13:49PM +0530, Taniya Das wrote: > >>>> > >>>> > >>>> On 11/11/2025 4:16 PM, Dmitry Baryshkov wrote: > >>>>> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote: > >>>>>> Add the RPMH clocks present in Kaanapali SoC. > >>>>>> > >>>>>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> > >>>>>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > >>>>>> --- > >>>>>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > >>>>>> 1 file changed, 42 insertions(+) > >>>>>> > >>>>>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c > >>>>>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644 > >>>>>> --- a/drivers/clk/qcom/clk-rpmh.c > >>>>>> +++ b/drivers/clk/qcom/clk-rpmh.c > >>>>>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1); > >>>>>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1); > >>>>>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1); > >>>>>> > >>>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2); > >>>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2); > >>>>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2); > >>>>>> + > >>>>>> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1); > >>>>>> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1); > >>>>> > >>>>> What is the difference between these clocks and clk[3458] defined few > >>>>> lines above? Why are they named differently? If the other name is > >>>>> incorrect, please fix it. > >>>>> > >>>> > >>>> Dmitry, my intention was to make a clear distinction between the ‘rf’ > >>>> clocks and the ‘ln’ clocks. Since there could be overlap in the > >>>> numbering, I added prefixes for clarity. I should have applied the same > >>>> approach to clk[3458] as well. I will add the fix-up for the same. > >>> > >>> Why do we need to distinguish between them here? The resources in CMD-DB > >>> don't have such a difference. You'll select whether the clock is RF or > >>> LN when describing the platform data. > >>> > >> > >> It is more for readibility and maintain a direct mapping with the PMIC > >> clock grid. This way we can immediately identify the clock type without > >> cross-referencing desc as the clock mapping here would indicate the type > >> of clock. Yes, the CMD-DB name does not reflect anything with the names > >> here. Please do let me know your suggestion. > > > > I'd prefer if variables reflect CMD-DB resource names rather than the > > actual clock usage. In the end, platform data does exactly that - it > > maps usage to CMD-DB resources. > > > > Actually the grid does not reflect the cmd-db resource name at all, so I > do not think that is the right approach. Let me move to completely > remove the 'ln' and 'rf' references and refer them to 'clkN'. > > > Also, if we follow your proposal, we will end up with ln_bb_clk and > > rf_clk referencing exactly the same resource, causing possible > > confusion. > > > > Sure, Dmitry, I will move to use clkN and remove the suffixes. prefixes. But that reminded me: if you think that it's worth it, please correct existing entries to have _a_e0 suffix instead of plain _a. -- With best wishes Dmitry
On 11/11/2025 6:46 PM, Dmitry Baryshkov wrote:
> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote:
>> Add the RPMH clocks present in Kaanapali SoC.
>>
>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
>> ---
>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 42 insertions(+)
>>
>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
>> --- a/drivers/clk/qcom/clk-rpmh.c
>> +++ b/drivers/clk/qcom/clk-rpmh.c
>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
>>
>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
Shall this suffix necessary to have e0?
>> +
>> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
>> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
>
> What is the difference between these clocks and clk[3458] defined few
> lines above? Why are they named differently? If the other name is
> incorrect, please fix it.
Good shot. Only now I can understand the previous comments.
IMO for kaanapali Taniya was addressed to have the right rf_clkN naming
here.
I think the point is glymur is not using "rf_clkN" for rf_clk, sm8750 is
not using "ln_bb_clkN" instead it is using clkN:
static struct clk_hw *sm8750_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] = &clk_rpmh_clk6_a2.hw,
[RPMH_LN_BB_CLK1_A] = &clk_rpmh_clk6_a2_ao.hw,
[RPMH_LN_BB_CLK3] = &clk_rpmh_clk8_a2.hw,
[RPMH_LN_BB_CLK3_A] = &clk_rpmh_clk8_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_a2.hw,
[RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_ao.hw,
[RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
};
static struct clk_hw *glymur_rpmh_clocks[] = {
[RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw,
[RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw,
[RPMH_RF_CLK3] = &clk_rpmh_clk3_a.hw,
[RPMH_RF_CLK3_A] = &clk_rpmh_clk3_a_ao.hw,
[RPMH_RF_CLK4] = &clk_rpmh_clk4_a.hw,
[RPMH_RF_CLK4_A] = &clk_rpmh_clk4_a_ao.hw,
[RPMH_RF_CLK5] = &clk_rpmh_clk5_a.hw,
[RPMH_RF_CLK5_A] = &clk_rpmh_clk5_a_ao.hw,
};
>
>> +
>> +DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
>> +DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
>> +
>> +DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
>> +
>> DEFINE_CLK_RPMH_BCM(ce, "CE0");
>> DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
>> DEFINE_CLK_RPMH_BCM(ipa, "IP0");
>> @@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
>> .num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
>> };
>>
>> +static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
>> + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
>> + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
>> + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
>> + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
>> + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
>> + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
>> + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
>> + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
>> + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
>> + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
>> + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
>> + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
>> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
>> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
>> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
>> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
>> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
>> +};
>> +
>> +static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
>> + .clks = kaanapali_rpmh_clocks,
>> + .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
>> +};
>> +
>> static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
>> void *data)
>> {
>> @@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
>>
>> static const struct of_device_id clk_rpmh_match_table[] = {
>> { .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
>> + { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
>> { .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
>> { .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
>> { .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
>>
>> --
>> 2.34.1
>>
>
--
Thx and BRs,
Aiqun(Maria) Yu
On Tue, Nov 11, 2025 at 07:44:36PM +0800, Aiqun(Maria) Yu wrote:
> On 11/11/2025 6:46 PM, Dmitry Baryshkov wrote:
> > On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote:
> >> Add the RPMH clocks present in Kaanapali SoC.
> >>
> >> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
> >> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
> >> ---
> >> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> >> 1 file changed, 42 insertions(+)
> >>
> >> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> >> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644
> >> --- a/drivers/clk/qcom/clk-rpmh.c
> >> +++ b/drivers/clk/qcom/clk-rpmh.c
> >> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1);
> >> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1);
> >> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1);
> >>
> >> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2);
>
>
> Shall this suffix necessary to have e0?
Can there be C6A_E1 at some point?
>
> >> +
> >> +DEFINE_CLK_RPMH_VRM(rf_clk1, _a_e0, "C1A_E0", 1);
> >> +DEFINE_CLK_RPMH_VRM(rf_clk2, _a_e0, "C2A_E0", 1);
> >
> > What is the difference between these clocks and clk[3458] defined few
> > lines above? Why are they named differently? If the other name is
> > incorrect, please fix it.
>
> Good shot. Only now I can understand the previous comments.
In future please ask questions instead of ignoring the comments that the
engineer can understand.
> IMO for kaanapali Taniya was addressed to have the right rf_clkN naming
> here.
>
> I think the point is glymur is not using "rf_clkN" for rf_clk, sm8750 is
> not using "ln_bb_clkN" instead it is using clkN:
I don't think it's that important. These clocks either should be handled
similarly, or there should be a good reason not to do it.
>
> static struct clk_hw *sm8750_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] = &clk_rpmh_clk6_a2.hw,
> [RPMH_LN_BB_CLK1_A] = &clk_rpmh_clk6_a2_ao.hw,
> [RPMH_LN_BB_CLK3] = &clk_rpmh_clk8_a2.hw,
> [RPMH_LN_BB_CLK3_A] = &clk_rpmh_clk8_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_a2.hw,
> [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_ao.hw,
> [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
> static struct clk_hw *glymur_rpmh_clocks[] = {
> [RPMH_CXO_CLK] = &clk_rpmh_bi_tcxo_div2.hw,
> [RPMH_CXO_CLK_A] = &clk_rpmh_bi_tcxo_div2_ao.hw,
> [RPMH_RF_CLK3] = &clk_rpmh_clk3_a.hw,
> [RPMH_RF_CLK3_A] = &clk_rpmh_clk3_a_ao.hw,
> [RPMH_RF_CLK4] = &clk_rpmh_clk4_a.hw,
> [RPMH_RF_CLK4_A] = &clk_rpmh_clk4_a_ao.hw,
> [RPMH_RF_CLK5] = &clk_rpmh_clk5_a.hw,
> [RPMH_RF_CLK5_A] = &clk_rpmh_clk5_a_ao.hw,
> };
>
> >
> >> +
> >> +DEFINE_CLK_RPMH_VRM(rf_clk3, _a2_e0, "C3A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(rf_clk4, _a2_e0, "C4A_E0", 2);
> >> +DEFINE_CLK_RPMH_VRM(rf_clk5, _a2_e0, "C5A_E0", 2);
> >> +
> >> +DEFINE_CLK_RPMH_VRM(div_clk1, _a4_e0, "C11A_E0", 4);
> >> +
> >> DEFINE_CLK_RPMH_BCM(ce, "CE0");
> >> DEFINE_CLK_RPMH_BCM(hwkm, "HK0");
> >> DEFINE_CLK_RPMH_BCM(ipa, "IP0");
> >> @@ -901,6 +914,34 @@ static const struct clk_rpmh_desc clk_rpmh_glymur = {
> >> .num_clks = ARRAY_SIZE(glymur_rpmh_clocks),
> >> };
> >>
> >> +static struct clk_hw *kaanapali_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] = &clk_rpmh_div_clk1_a4_e0.hw,
> >> + [RPMH_LN_BB_CLK1] = &clk_rpmh_ln_bb_clk1_a2_e0.hw,
> >> + [RPMH_LN_BB_CLK1_A] = &clk_rpmh_ln_bb_clk1_a2_e0_ao.hw,
> >> + [RPMH_LN_BB_CLK2] = &clk_rpmh_ln_bb_clk2_a2_e0.hw,
> >> + [RPMH_LN_BB_CLK2_A] = &clk_rpmh_ln_bb_clk2_a2_e0_ao.hw,
> >> + [RPMH_LN_BB_CLK3] = &clk_rpmh_ln_bb_clk3_a2_e0.hw,
> >> + [RPMH_LN_BB_CLK3_A] = &clk_rpmh_ln_bb_clk3_a2_e0_ao.hw,
> >> + [RPMH_RF_CLK1] = &clk_rpmh_rf_clk1_a_e0.hw,
> >> + [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_e0_ao.hw,
> >> + [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a_e0.hw,
> >> + [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_e0_ao.hw,
> >> + [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a2_e0.hw,
> >> + [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a2_e0_ao.hw,
> >> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0.hw,
> >> + [RPMH_RF_CLK4] = &clk_rpmh_rf_clk4_a2_e0_ao.hw,
> >> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0.hw,
> >> + [RPMH_RF_CLK5_A] = &clk_rpmh_rf_clk5_a2_e0_ao.hw,
> >> + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> >> +};
> >> +
> >> +static const struct clk_rpmh_desc clk_rpmh_kaanapali = {
> >> + .clks = kaanapali_rpmh_clocks,
> >> + .num_clks = ARRAY_SIZE(kaanapali_rpmh_clocks),
> >> +};
> >> +
> >> static struct clk_hw *of_clk_rpmh_hw_get(struct of_phandle_args *clkspec,
> >> void *data)
> >> {
> >> @@ -991,6 +1032,7 @@ static int clk_rpmh_probe(struct platform_device *pdev)
> >>
> >> static const struct of_device_id clk_rpmh_match_table[] = {
> >> { .compatible = "qcom,glymur-rpmh-clk", .data = &clk_rpmh_glymur},
> >> + { .compatible = "qcom,kaanapali-rpmh-clk", .data = &clk_rpmh_kaanapali},
> >> { .compatible = "qcom,milos-rpmh-clk", .data = &clk_rpmh_milos},
> >> { .compatible = "qcom,qcs615-rpmh-clk", .data = &clk_rpmh_qcs615},
> >> { .compatible = "qcom,qdu1000-rpmh-clk", .data = &clk_rpmh_qdu1000},
> >>
> >> --
> >> 2.34.1
> >>
> >
>
> --
> Thx and BRs,
> Aiqun(Maria) Yu
--
With best wishes
Dmitry
On 11/11/25 1:16 PM, Dmitry Baryshkov wrote: > On Tue, Nov 11, 2025 at 07:44:36PM +0800, Aiqun(Maria) Yu wrote: >> On 11/11/2025 6:46 PM, Dmitry Baryshkov wrote: >>> On Thu, Oct 30, 2025 at 04:39:07PM +0530, Taniya Das wrote: >>>> Add the RPMH clocks present in Kaanapali SoC. >>>> >>>> Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> >>>> Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> >>>> --- >>>> drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++ >>>> 1 file changed, 42 insertions(+) >>>> >>>> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c >>>> index 1a98b3a0c528c24b600326e6b951b2edb6dcadd7..fd0fe312a7f2830a27e6effc0c0bd905d9d5ebed 100644 >>>> --- a/drivers/clk/qcom/clk-rpmh.c >>>> +++ b/drivers/clk/qcom/clk-rpmh.c >>>> @@ -395,6 +395,19 @@ DEFINE_CLK_RPMH_VRM(clk4, _a, "C4A_E0", 1); >>>> DEFINE_CLK_RPMH_VRM(clk5, _a, "C5A_E0", 1); >>>> DEFINE_CLK_RPMH_VRM(clk8, _a, "C8A_E0", 1); >>>> >>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk1, _a2_e0, "C6A_E0", 2); >>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk2, _a2_e0, "C7A_E0", 2); >>>> +DEFINE_CLK_RPMH_VRM(ln_bb_clk3, _a2_e0, "C8A_E0", 2); >> >> >> Shall this suffix necessary to have e0? > > Can there be C6A_E1 at some point? Yes Konrad
On 10/30/2025 4:39 PM, Taniya Das wrote: > Add the RPMH clocks present in Kaanapali SoC. > > Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com> > Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com> > --- > drivers/clk/qcom/clk-rpmh.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > Reviewed-by: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com> Thanks, Jagadeesh
© 2016 - 2026 Red Hat, Inc.