Commit 6f871f0d authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

Merge branch '20240202-x1e80100-clock-controllers-v4-5-7fb08c861c7c@linaro.org' into arm64-for-6.9 

Merge the X1E clock binding topic branch, to gain access to the many
clock defines.
parents f9491ad2 7180f368

Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ description: | 
    include/dt-bindings/clock/qcom,sm8450-camcc.h

    include/dt-bindings/clock/qcom,sm8550-camcc.h

    include/dt-bindings/clock/qcom,sc8280xp-camcc.h

    include/dt-bindings/clock/qcom,x1e80100-camcc.h



allOf:

  - $ref: qcom,gcc.yaml#
@@ -27,6 +28,7 @@ properties: 
      - qcom,sc8280xp-camcc

      - qcom,sm8450-camcc

      - qcom,sm8550-camcc

      - qcom,x1e80100-camcc



  clocks:

    items:

Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ description: | 
    include/dt-bindings/clock/qcom,sm8550-gpucc.h

    include/dt-bindings/reset/qcom,sm8450-gpucc.h

    include/dt-bindings/reset/qcom,sm8650-gpucc.h

    include/dt-bindings/reset/qcom,x1e80100-gpucc.h



properties:

  compatible:
@@ -25,6 +26,7 @@ properties: 
      - qcom,sm8450-gpucc

      - qcom,sm8550-gpucc

      - qcom,sm8650-gpucc

      - qcom,x1e80100-gpucc



  clocks:

    items:

Documentation/devicetree/bindings/clock/qcom,sm8550-dispcc.yaml

+6 −1
Original line number Diff line number Diff line
@@ -14,12 +14,17 @@ description: | 
  Qualcomm display clock control module provides the clocks, resets and power

  domains on SM8550.



  See also:: include/dt-bindings/clock/qcom,sm8550-dispcc.h

  See also:

  - include/dt-bindings/clock/qcom,sm8550-dispcc.h

  - include/dt-bindings/clock/qcom,sm8650-dispcc.h

  - include/dt-bindings/clock/qcom,x1e80100-dispcc.h



properties:

  compatible:

    enum:

      - qcom,sm8550-dispcc

      - qcom,sm8650-dispcc

      - qcom,x1e80100-dispcc



  clocks:

    items:

Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - enum:

          - qcom,sm8550-tcsr

          - qcom,sm8650-tcsr

          - qcom,x1e80100-tcsr

      - const: syscon



  clocks:

Documentation/devicetree/bindings/clock/qcom,sm8650-dispcc.yaml

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/qcom,sm8650-dispcc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm Display Clock & Reset Controller for SM8650



maintainers:

  - Bjorn Andersson <andersson@kernel.org>

  - Neil Armstrong <neil.armstrong@linaro.org>



description: |

  Qualcomm display clock control module provides the clocks, resets and power

  domains on SM8650.



  See also:: include/dt-bindings/clock/qcom,sm8650-dispcc.h



properties:

  compatible:

    enum:

      - qcom,sm8650-dispcc



  clocks:

    items:

      - description: Board XO source

      - description: Board Always On XO source

      - description: Display's AHB clock

      - description: sleep clock

      - description: Byte clock from DSI PHY0

      - description: Pixel clock from DSI PHY0

      - description: Byte clock from DSI PHY1

      - description: Pixel clock from DSI PHY1

      - description: Link clock from DP PHY0

      - description: VCO DIV clock from DP PHY0

      - description: Link clock from DP PHY1

      - description: VCO DIV clock from DP PHY1

      - description: Link clock from DP PHY2

      - description: VCO DIV clock from DP PHY2

      - description: Link clock from DP PHY3

      - description: VCO DIV clock from DP PHY3



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  reg:

    maxItems: 1



  power-domains:

    description:

      A phandle and PM domain specifier for the MMCX power domain.

    maxItems: 1



  required-opps:

    description:

      A phandle to an OPP node describing required MMCX performance point.

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/qcom,sm8650-gcc.h>

    #include <dt-bindings/clock/qcom,rpmh.h>

    #include <dt-bindings/power/qcom-rpmpd.h>

    #include <dt-bindings/power/qcom,rpmhpd.h>

    clock-controller@af00000 {

      compatible = "qcom,sm8650-dispcc";

      reg = <0x0af00000 0x10000>;

      clocks = <&rpmhcc RPMH_CXO_CLK>,

               <&rpmhcc RPMH_CXO_CLK_A>,

               <&gcc GCC_DISP_AHB_CLK>,

               <&sleep_clk>,

               <&dsi0_phy 0>,

               <&dsi0_phy 1>,

               <&dsi1_phy 0>,

               <&dsi1_phy 1>,

               <&dp0_phy 0>,

               <&dp0_phy 1>,

               <&dp1_phy 0>,

               <&dp1_phy 1>,

               <&dp2_phy 0>,

               <&dp2_phy 1>,

               <&dp3_phy 0>,

               <&dp3_phy 1>;

      #clock-cells = <1>;

      #reset-cells = <1>;

      #power-domain-cells = <1>;

      power-domains = <&rpmhpd RPMHPD_MMCX>;

      required-opps = <&rpmhpd_opp_low_svs>;

    };

...