On Qualcomm SoCs, certain branch clocks either need to be always-on, or should be if you're interested in touching some part of the hardware. Using CLK_IS_CRITICAL for this purpose sounds like a genius idea, however that messes with the runtime pm handling - if a clock is marked as such, the clock controller device will never enter the "suspended" state, leaving the associated resources online, which in turn breaks SoC-wide suspend. This series aims to solve that on a couple SoCs that I could test the changes on and it sprinkles some runtime pm enablement atop these drivers. Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx> --- Changes in v2: - Rebase - Pick up tags - Fix up missing pm_runtime_put in SM6375 GCC (Johan) - Clarify the commit message of "Add runtime PM" commits (Johan) - "GPU_CCC" -> "GPU_CC" (oops) - Rebase atop next-20231129 - Also fix up camcc-sm8550 & gcc-sm4450 - Unify and clean up the comment style - Fix missing comments in gcc-sc7180.. - Drop Johan's ack from "clk: qcom: Use qcom_branch_set_clk_en()" - Improve 6115 dt patch commit message (Bjorn) - Link to v1: https://lore.kernel.org/r/20230717-topic-branch_aon_cleanup-v1-0-27784d27a4f4@xxxxxxxxxx --- Konrad Dybcio (15): clk: qcom: branch: Add a helper for setting the enable bit clk: qcom: Use qcom_branch_set_clk_en() clk: qcom: gcc-sm6375: Unregister critical clocks clk: qcom: gcc-sm6375: Add runtime PM clk: qcom: gpucc-sm6375: Unregister critical clocks clk: qcom: gpucc-sm6115: Unregister critical clocks clk: qcom: gpucc-sm6115: Add runtime PM clk: qcom: gcc-sm6115: Unregister critical clocks clk: qcom: gcc-sm6115: Add runtime PM clk: qcom: gcc-qcm2290: Unregister critical clocks clk: qcom: gcc-qcm2290: Add runtime PM arm64: dts: qcom: sm6375: Add VDD_CX to GCC arm64: dts: qcom: qcm2290: Add VDD_CX to GCC arm64: dts: qcom: sm6115: Add VDD_CX to GCC arm64: dts: qcom: sm6115: Add VDD_CX to GPU_CC arch/arm64/boot/dts/qcom/qcm2290.dtsi | 1 + arch/arm64/boot/dts/qcom/sm6115.dtsi | 3 + arch/arm64/boot/dts/qcom/sm6375.dtsi | 1 + drivers/clk/qcom/camcc-sm8550.c | 9 +-- drivers/clk/qcom/clk-branch.h | 7 ++ drivers/clk/qcom/dispcc-qcm2290.c | 3 +- drivers/clk/qcom/dispcc-sc7280.c | 6 +- drivers/clk/qcom/dispcc-sc8280xp.c | 3 +- drivers/clk/qcom/dispcc-sm6115.c | 3 +- drivers/clk/qcom/dispcc-sm8250.c | 3 +- drivers/clk/qcom/dispcc-sm8450.c | 6 +- drivers/clk/qcom/dispcc-sm8550.c | 6 +- drivers/clk/qcom/gcc-qcm2290.c | 127 ++++++----------------------- drivers/clk/qcom/gcc-sa8775p.c | 24 +++--- drivers/clk/qcom/gcc-sc7180.c | 21 ++--- drivers/clk/qcom/gcc-sc7280.c | 19 ++--- drivers/clk/qcom/gcc-sc8180x.c | 27 +++---- drivers/clk/qcom/gcc-sc8280xp.c | 24 +++--- drivers/clk/qcom/gcc-sdx55.c | 11 +-- drivers/clk/qcom/gcc-sdx65.c | 12 +-- drivers/clk/qcom/gcc-sdx75.c | 9 +-- drivers/clk/qcom/gcc-sm4450.c | 27 ++----- drivers/clk/qcom/gcc-sm6115.c | 145 +++++++--------------------------- drivers/clk/qcom/gcc-sm6375.c | 126 +++++++---------------------- drivers/clk/qcom/gcc-sm7150.c | 22 ++---- drivers/clk/qcom/gcc-sm8250.c | 18 ++--- drivers/clk/qcom/gcc-sm8350.c | 19 ++--- drivers/clk/qcom/gcc-sm8450.c | 20 ++--- drivers/clk/qcom/gcc-sm8550.c | 20 ++--- drivers/clk/qcom/gpucc-sc7280.c | 8 +- drivers/clk/qcom/gpucc-sc8280xp.c | 8 +- drivers/clk/qcom/gpucc-sm6115.c | 52 +++++------- drivers/clk/qcom/gpucc-sm6375.c | 33 +------- drivers/clk/qcom/gpucc-sm8550.c | 9 +-- drivers/clk/qcom/lpasscorecc-sc7180.c | 6 +- drivers/clk/qcom/videocc-sm8250.c | 5 +- drivers/clk/qcom/videocc-sm8350.c | 9 +-- drivers/clk/qcom/videocc-sm8450.c | 12 +-- drivers/clk/qcom/videocc-sm8550.c | 12 +-- 39 files changed, 236 insertions(+), 640 deletions(-) --- base-commit: 1f5c003694fab4b1ba6cbdcc417488b975c088d0 change-id: 20230717-topic-branch_aon_cleanup-6976c13fe71c Best regards, -- Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
