The shared RPMH clock driver now covers SM8550, SM8650 and SA8775P. SC7280 exposes the same always-on RPMH clocks, so wire it up the same way: register the "qcom,sc7280-rpmh-clk" compatible in the shared driver, have CLK_QCOM_SC7280 select CLK_QCOM_RPMH, and drop the SC7280 entry from the clk-stub match table now that the real driver claims it.
Signed-off-by: Balaji Selvanathan <[email protected]> --- This depends on the shared RPMH clock driver introduced in "clk: qcom: Add shared RPMH clock driver for SM8550/SM8650/SA8775P" (Message-ID: [email protected]). https://lore.kernel.org/u-boot/[email protected]/ --- drivers/clk/clk-stub.c | 1 - drivers/clk/qcom/Kconfig | 7 ++++--- drivers/clk/qcom/clock-rpmh.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-stub.c b/drivers/clk/clk-stub.c index 85e54841386..74825f87580 100644 --- a/drivers/clk/clk-stub.c +++ b/drivers/clk/clk-stub.c @@ -52,7 +52,6 @@ static const struct udevice_id stub_clk_ids[] = { { .compatible = "qcom,qcs615-rpmh-clk" }, { .compatible = "qcom,rpmcc" }, { .compatible = "qcom,sc7180-rpmh-clk" }, - { .compatible = "qcom,sc7280-rpmh-clk" }, { .compatible = "qcom,sdm670-rpmh-clk" }, { .compatible = "qcom,sdm845-rpmh-clk" }, { .compatible = "qcom,sm6350-rpmh-clk" }, diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig index 8596b93d4c4..cc4053f4955 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -92,9 +92,9 @@ config CLK_QCOM_RPMH depends on CLK help Say Y here to enable support for the RPMh-managed clocks found on - SoCs such as SM8550, SM8650 and SA8775P. These clocks are owned by - the always-on subsystem; the driver only reports the fixed CXO rate - (bi_tcxo_div2) and accepts no-op enable/set_rate requests. + SoCs such as SC7280, SM8550, SM8650 and SA8775P. These clocks are + owned by the always-on subsystem; the driver only reports the fixed + CXO rate (bi_tcxo_div2) and accepts no-op enable/set_rate requests. config CLK_QCOM_SA8775P bool "Qualcomm SA8775 GCC" @@ -181,6 +181,7 @@ config CLK_QCOM_SM8650 config CLK_QCOM_SC7280 bool "Qualcomm SC7280 GCC" select CLK_QCOM + select CLK_QCOM_RPMH help Say Y here to enable support for the Global Clock Controller on the Snapdragon SC7280 SoC. This driver supports the clocks diff --git a/drivers/clk/qcom/clock-rpmh.c b/drivers/clk/qcom/clock-rpmh.c index 69f2a751441..5d01b482fc3 100644 --- a/drivers/clk/qcom/clock-rpmh.c +++ b/drivers/clk/qcom/clock-rpmh.c @@ -47,6 +47,7 @@ static struct clk_ops qcom_rpmh_clk_ops = { static const struct udevice_id qcom_rpmh_clk_ids[] = { { .compatible = "qcom,sa8775p-rpmh-clk", .data = TCXO_DIV2_RATE }, + { .compatible = "qcom,sc7280-rpmh-clk", .data = TCXO_DIV2_RATE }, { .compatible = "qcom,sm8550-rpmh-clk", .data = TCXO_DIV2_RATE }, { .compatible = "qcom,sm8650-rpmh-clk", .data = TCXO_DIV2_RATE }, { } --- base-commit: 939ca75844af693dde313f279e3210f7c3beace7 change-id: 20260820-clk-qcom-sc7280-rpmh-ccda826d0037 Best regards, -- Balaji Selvanathan <[email protected]>
