Merge branch '20240602114439.1611-1-quic_jkona@quicinc.com' into clk-for-6.11

Merge SM8650 video and camera clock drivers through topic branch, to
make available the DeviceTree binding includes to the DeviceTree source
branches as well.

diff --cc Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml
index 74034e3,8ce5972..b2792b4
--- 1/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml
--- 2/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml
@@@ -20,7 -23,11 +23,8 @@@ properties
      enum:
        - qcom,sm8450-videocc
        - qcom,sm8550-videocc
+       - qcom,sm8650-videocc
  
 -  reg:
 -    maxItems: 1
 -
    clocks:
      items:
        - description: Board XO source

diff --cc drivers/clk/qcom/Kconfig
Simple merge

diff --cc drivers/clk/qcom/Makefile
Simple merge

diff --cc drivers/clk/qcom/videocc-sm8550.c
index 4d36362,c601c35..97d150b
--- 1/drivers/clk/qcom/videocc-sm8550.c
--- 2/drivers/clk/qcom/videocc-sm8550.c
+++ b/drivers/clk/qcom/videocc-sm8550.c
@@@ -430,10 -576,10 +576,10 @@@ static int video_cc_sm8550_probe(struc
  
        /* Keep some clocks always-on */
        qcom_branch_set_clk_en(regmap, 0x80f4); /* VIDEO_CC_AHB_CLK */
-       qcom_branch_set_clk_en(regmap, 0x8140); /* VIDEO_CC_SLEEP_CLK */
+       qcom_branch_set_clk_en(regmap, sleep_clk_offset); /* VIDEO_CC_SLEEP_CLK */
        qcom_branch_set_clk_en(regmap, 0x8124); /* VIDEO_CC_XO_CLK */
  
 -      ret = qcom_cc_really_probe(pdev, &video_cc_sm8550_desc, regmap);
 +      ret = qcom_cc_really_probe(&pdev->dev, &video_cc_sm8550_desc, regmap);
  
        pm_runtime_put(&pdev->dev);