devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Conor Dooley <conor+dt@kernel.org>
Cc: Jon Hunter <jonathanh@nvidia.com>,
	Sameer Pujar <spujar@nvidia.com>,
	devicetree@vger.kernel.org, linux-tegra@vger.kernel.org
Subject: [PATCH 2/2] dt-bindings: sound: tegra: Correct clocks and resets for HDA
Date: Thu, 18 Jan 2024 15:27:06 +0100	[thread overview]
Message-ID: <20240118142706.4179146-2-thierry.reding@gmail.com> (raw)
In-Reply-To: <20240118142706.4179146-1-thierry.reding@gmail.com>

From: Thierry Reding <treding@nvidia.com>

The HDA controller on Tegra194 and Tegra234 uses a slightly different
set of clocks and resets, so describe those accurately in the bindings.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 .../bindings/sound/nvidia,tegra30-hda.yaml    | 95 +++++++++++++++++--
 1 file changed, 85 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
index 12c31b4b99e1..e64c99b6b20b 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
@@ -23,8 +23,6 @@ properties:
       - const: nvidia,tegra30-hda
       - items:
           - enum:
-              - nvidia,tegra234-hda
-              - nvidia,tegra194-hda
               - nvidia,tegra186-hda
               - nvidia,tegra210-hda
               - nvidia,tegra124-hda
@@ -33,6 +31,8 @@ properties:
           - const: nvidia,tegra132-hda
           - const: nvidia,tegra124-hda
           - const: nvidia,tegra30-hda
+      - const: nvidia,tegra194-hda
+      - const: nvidia,tegra234-hda
 
   reg:
     maxItems: 1
@@ -47,10 +47,7 @@ properties:
 
   clock-names:
     minItems: 2
-    items:
-      - const: hda
-      - const: hda2hdmi
-      - const: hda2codec_2x
+    maxItems: 3
 
   resets:
     minItems: 2
@@ -58,10 +55,7 @@ properties:
 
   reset-names:
     minItems: 2
-    items:
-      - const: hda
-      - const: hda2hdmi
-      - const: hda2codec_2x
+    maxItems: 3
 
   power-domains:
     maxItems: 1
@@ -83,6 +77,87 @@ properties:
       The user-visible name of this sound complex. If this property is
       not specified then boards can use default name provided in hda driver.
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - nvidia,tegra30-hda
+              - nvidia,tegra114-hda
+              - nvidia,tegra124-hda
+              - nvidia,tegra132-hda
+              - nvidia,tegra210-hda
+              - nvidia,tegra186-hda
+    then:
+      properties:
+        clocks:
+          minItems: 3
+          maxItems: 3
+
+        clock-names:
+          items:
+            - const: hda
+            - const: hda2hdmi
+            - const: hda2codec_2x
+
+        resets:
+          minItems: 3
+          maxItems: 3
+
+        reset-names:
+          items:
+            - const: hda
+            - const: hda2hdmi
+            - const: hda2codec_2x
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: nvidia,tegra194-hda
+    then:
+      properties:
+        clocks:
+          minItems: 3
+
+        clock-names:
+          items:
+            - const: hda
+            - const: hda2hdmi
+            - const: hda2codec_2x
+
+        resets:
+          maxItems: 2
+
+        reset-names:
+          items:
+            - const: hda
+            - const: hda2hdmi
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: nvidia,tegra234-hda
+    then:
+      properties:
+        clocks:
+          maxItems: 2
+
+        clock-names:
+          items:
+            - const: hda
+            - const: hda2codec_2x
+
+        resets:
+          maxItems: 2
+
+        reset-names:
+          items:
+            - const: hda
+            - const: hda2codec_2x
+
 required:
   - compatible
   - reg
-- 
2.43.0


  reply	other threads:[~2024-01-18 14:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-18 14:27 [PATCH 1/2] ASoC: dt-bindings: tegra: Document iommus and interconnects for ADMAIF Thierry Reding
2024-01-18 14:27 ` Thierry Reding [this message]
2024-01-30 17:56   ` [PATCH 2/2] dt-bindings: sound: tegra: Correct clocks and resets for HDA Rob Herring
2024-01-30 17:53 ` [PATCH 1/2] ASoC: dt-bindings: tegra: Document iommus and interconnects for ADMAIF Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240118142706.4179146-2-thierry.reding@gmail.com \
    --to=thierry.reding@gmail.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=spujar@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).