From: Bjorn Andersson <andersson@kernel.org>
Date: Fri, 8 Dec 2023 04:19:15 +0000 (-0800)
Subject: Merge branch '20231205061002.30759-4-quic_sibis@quicinc.com' into clk-for-6.8
X-Git-Tag: microblaze-v6.10~600^2~2^3^2~16
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=12c4ffcd3b87c8b41360e1ab0cf4e87cc1a7f370;p=linux-2.6-microblaze.git

Merge branch '20231205061002.30759-4-quic_sibis@quicinc.com' into clk-for-6.8

Merge the X1E80100 DeviceTree bindings through a topic branch, to allow
the clock constants to be shared with the DeviceTree branch.
---

12c4ffcd3b87c8b41360e1ab0cf4e87cc1a7f370
diff --cc Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml
index 9be952a5a227,603da187d62e..ca857942ed6c
--- a/Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml
@@@ -35,7 -35,7 +35,8 @@@ properties
        - qcom,sm8350-rpmh-clk
        - qcom,sm8450-rpmh-clk
        - qcom,sm8550-rpmh-clk
 +      - qcom,sm8650-rpmh-clk
+       - qcom,x1e80100-rpmh-clk
  
    clocks:
      maxItems: 1