diff mbox series

dt-bindings: clock: qcom,videocc: correct clocks per variant

Message ID 20221224154152.43272-1-krzysztof.kozlowski@linaro.org (mailing list archive)
State Awaiting Upstream, archived
Headers show
Series dt-bindings: clock: qcom,videocc: correct clocks per variant | expand

Commit Message

Krzysztof Kozlowski Dec. 24, 2022, 3:41 p.m. UTC
Different SoCs come with a bit different clock inputs:

  sm8250-mtp.dtb: clock-controller@abf0000: clock-names:0: 'bi_tcxo' was expected
  sm8250-mtp.dtb: clock-controller@abf0000: clock-names: ['iface', 'bi_tcxo', 'bi_tcxo_ao'] is too long

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../bindings/clock/qcom,videocc.yaml          | 59 +++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

Comments

Stephen Boyd Jan. 4, 2023, 1:25 a.m. UTC | #1
Quoting Krzysztof Kozlowski (2022-12-24 07:41:52)
> Different SoCs come with a bit different clock inputs:
> 
>   sm8250-mtp.dtb: clock-controller@abf0000: clock-names:0: 'bi_tcxo' was expected
>   sm8250-mtp.dtb: clock-controller@abf0000: clock-names: ['iface', 'bi_tcxo', 'bi_tcxo_ao'] is too long
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---

Reviewed-by: Stephen Boyd <sboyd@kernel.org>
Rob Herring (Arm) Jan. 17, 2023, 4:50 p.m. UTC | #2
On Sat, 24 Dec 2022 16:41:52 +0100, Krzysztof Kozlowski wrote:
> Different SoCs come with a bit different clock inputs:
> 
>   sm8250-mtp.dtb: clock-controller@abf0000: clock-names:0: 'bi_tcxo' was expected
>   sm8250-mtp.dtb: clock-controller@abf0000: clock-names: ['iface', 'bi_tcxo', 'bi_tcxo_ao'] is too long
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/clock/qcom,videocc.yaml          | 59 +++++++++++++++++--
>  1 file changed, 55 insertions(+), 4 deletions(-)
> 

Applied, thanks!
Bjorn Andersson Jan. 17, 2023, 6:24 p.m. UTC | #3
On Sat, 24 Dec 2022 16:41:52 +0100, Krzysztof Kozlowski wrote:
> Different SoCs come with a bit different clock inputs:
> 
>   sm8250-mtp.dtb: clock-controller@abf0000: clock-names:0: 'bi_tcxo' was expected
>   sm8250-mtp.dtb: clock-controller@abf0000: clock-names: ['iface', 'bi_tcxo', 'bi_tcxo_ao'] is too long
> 
> 

Applied, thanks!

[1/1] dt-bindings: clock: qcom,videocc: correct clocks per variant
      commit: 06839dfc87984ae73d2204a8efa4c7e7b6e12d97

Best regards,
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml
index e221985e743f..2b07146161b4 100644
--- a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml
@@ -30,12 +30,12 @@  properties:
       - qcom,sm8250-videocc
 
   clocks:
-    items:
-      - description: Board XO source
+    minItems: 1
+    maxItems: 3
 
   clock-names:
-    items:
-      - const: bi_tcxo
+    minItems: 1
+    maxItems: 3
 
   '#clock-cells':
     const: 1
@@ -68,6 +68,57 @@  required:
   - '#reset-cells'
   - '#power-domain-cells'
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          enum:
+            - qcom,sc7180-videocc
+            - qcom,sdm845-videocc
+            - qcom,sm8150-videocc
+    then:
+      properties:
+        clocks:
+          items:
+            - description: Board XO source
+        clock-names:
+          items:
+            - const: bi_tcxo
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - qcom,sc7280-videocc
+    then:
+      properties:
+        clocks:
+          items:
+            - description: Board XO source
+            - description: Board active XO source
+        clock-names:
+          items:
+            - const: bi_tcxo
+            - const: bi_tcxo_ao
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - qcom,sm8250-videocc
+    then:
+      properties:
+        clocks:
+          items:
+            - description: AHB
+            - description: Board XO source
+            - description: Board active XO source
+        clock-names:
+          items:
+            - const: iface
+            - const: bi_tcxo
+            - const: bi_tcxo_ao
+
 additionalProperties: false
 
 examples: