Commit 3be492cf authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

Merge branch '20231026105345.3376-3-bryan.odonoghue@linaro.org' into clk-for-6.8 

Merge the SC8280XP Camera Clock Controller binding changes through a
topic branch to allow them to be merged and used in the DeviceTree
source branch as well.
parents cec1f2ff 206cd759

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

+4 −14
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ description: | 


  See also:: include/dt-bindings/clock/qcom,camcc-sm8250.h



allOf:

  - $ref: qcom,gcc.yaml#



properties:

  compatible:

    const: qcom,sm8250-camcc
@@ -33,15 +36,6 @@ properties: 
      - const: bi_tcxo_ao

      - const: sleep_clk



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  power-domains:

    items:

      - description: MMCX power domain
@@ -56,14 +50,10 @@ properties: 


required:

  - compatible

  - reg

  - clocks

  - clock-names

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+4 −14
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ description: | 


  See also:: include/dt-bindings/clock/qcom,camcc-sc7180.h



allOf:

  - $ref: qcom,gcc.yaml#



properties:

  compatible:

    const: qcom,sc7180-camcc
@@ -31,28 +34,15 @@ properties: 
      - const: iface

      - const: xo



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+4 −14
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ description: | 


  See also:: include/dt-bindings/clock/qcom,camcc-sc7280.h



allOf:

  - $ref: qcom,gcc.yaml#



properties:

  compatible:

    const: qcom,sc7280-camcc
@@ -31,28 +34,15 @@ properties: 
      - const: bi_tcxo_ao

      - const: sleep_clk



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+4 −14
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ description: | 


  See also:: include/dt-bindings/clock/qcom,camcc-sm845.h



allOf:

  - $ref: qcom,gcc.yaml#



properties:

  compatible:

    const: qcom,sdm845-camcc
@@ -27,28 +30,15 @@ properties: 
    items:

      - const: bi_tcxo



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+6 −14
Original line number Diff line number Diff line
@@ -16,10 +16,15 @@ description: | 
  See also::

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

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

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



allOf:

  - $ref: qcom,gcc.yaml#



properties:

  compatible:

    enum:

      - qcom,sc8280xp-camcc

      - qcom,sm8450-camcc

      - qcom,sm8550-camcc
@@ -40,29 +45,16 @@ properties: 
    description:

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



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - power-domains

  - required-opps

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false

unevaluatedProperties: false



examples:

  - |