[PATCH 1/2] ASoC: dt-bindings: tegra: Document iommus and interconnects for ADMAIF

[PATCH 1/2] ASoC: dt-bindings: tegra: Document iommus and interconnects for ADMAIF

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

The ADMAIF is responsible for accessing system memory on behalf of other
components of the APE, so make sure it can be hooked up to an IOMMU and
memory controller.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 .../bindings/sound/nvidia,tegra210-admaif.yaml       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
index 15ab40aeab1e..59304f02d063 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
@@ -39,6 +39,18 @@ properties:
 
   dma-names: true
 
+  iommus:
+    maxItems: 1
+
+  interconnects:
+    description: Description of the interconnect paths for the ADMA interface; see
+      ../interconnect/interconnect.txt for details.
+
+  interconnect-names:
+    items:
+      - const: dma-mem # read
+      - const: write
+
   ports:
     $ref: /schemas/graph.yaml#/properties/ports
     description: |
-- 
2.43.0

[PATCH 2/2] dt-bindings: sound: tegra: Correct clocks and resets for HDA

[Thierry Reding]

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

Re: [PATCH 1/2] ASoC: dt-bindings: tegra: Document iommus and interconnects for ADMAIF

[Rob Herring]

On Thu, Jan 18, 2024 at 03:27:05PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> The ADMAIF is responsible for accessing system memory on behalf of other
> components of the APE, so make sure it can be hooked up to an IOMMU and
> memory controller.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  .../bindings/sound/nvidia,tegra210-admaif.yaml       | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
> index 15ab40aeab1e..59304f02d063 100644
> --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
> +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
> @@ -39,6 +39,18 @@ properties:
>  
>    dma-names: true
>  
> +  iommus:
> +    maxItems: 1
> +
> +  interconnects:
> +    description: Description of the interconnect paths for the ADMA interface; see
> +      ../interconnect/interconnect.txt for details.

Don't need generic descriptions of common properties. What you need is 
defining how many entries and a description for each entry.

Rob

Re: [PATCH 2/2] dt-bindings: sound: tegra: Correct clocks and resets for HDA

[Rob Herring]

On Thu, Jan 18, 2024 at 03:27:06PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>

Subject prefix is wrong. See patch 1 for correct prefix.

> 
> 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(-)

Otherwise,

Reviewed-by: Rob Herring <robh@kernel.org>