[PATCH 2/9] dt-bindings: arm: mediatek: Support mt8183-audiosys binding variant

Julien Massot posted 9 patches 2 months ago
There is a newer version of this series
[PATCH 2/9] dt-bindings: arm: mediatek: Support mt8183-audiosys binding variant
Posted by Julien Massot 2 months ago
Update the mediatek,audsys binding to support the mt8183-audiosys
compatible, which uses a different audio controller binding
(mt8183-afe-pcm.yaml) compared to the legacy mt2701-audio controller.

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
 .../bindings/arm/mediatek/mediatek,audsys.yaml          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
index 45d4a6620041b11cf6e943de49a42f3fcd91e1b9..5d9d91f9c5802240ac7d411c5632ae6663d15f29 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
@@ -23,6 +23,7 @@ properties:
               - mediatek,mt7622-audsys
               - mediatek,mt8167-audsys
               - mediatek,mt8173-audsys
+              - mediatek,mt8183-audiosys
               - mediatek,mt8183-audsys
               - mediatek,mt8186-audsys
               - mediatek,mt8192-audsys
@@ -41,7 +42,6 @@ properties:
     const: 1
 
   audio-controller:
-    $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
     type: object
 
 required:
@@ -50,6 +50,21 @@ required:
 
 additionalProperties: false
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: mediatek,mt8183-audiosys
+    then:
+      properties:
+        audio-controller:
+          $ref: /schemas/sound/mt8183-afe-pcm.yaml#
+    else:
+      properties:
+        audio-controller:
+          $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
+
 examples:
   - |
     #include <dt-bindings/interrupt-controller/arm-gic.h>

-- 
2.50.1
Re: [PATCH 2/9] dt-bindings: arm: mediatek: Support mt8183-audiosys binding variant
Posted by Rob Herring 2 months ago
On Fri, Aug 01, 2025 at 01:18:04PM +0200, Julien Massot wrote:
> Update the mediatek,audsys binding to support the mt8183-audiosys
> compatible, which uses a different audio controller binding
> (mt8183-afe-pcm.yaml) compared to the legacy mt2701-audio controller.

Looks like this one needs 'memory-region' added?

> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>
> ---
>  .../bindings/arm/mediatek/mediatek,audsys.yaml          | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> index 45d4a6620041b11cf6e943de49a42f3fcd91e1b9..5d9d91f9c5802240ac7d411c5632ae6663d15f29 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> @@ -23,6 +23,7 @@ properties:
>                - mediatek,mt7622-audsys
>                - mediatek,mt8167-audsys
>                - mediatek,mt8173-audsys
> +              - mediatek,mt8183-audiosys
>                - mediatek,mt8183-audsys
>                - mediatek,mt8186-audsys
>                - mediatek,mt8192-audsys
> @@ -41,7 +42,6 @@ properties:
>      const: 1
>  
>    audio-controller:
> -    $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
>      type: object
>  
>  required:
> @@ -50,6 +50,21 @@ required:
>  
>  additionalProperties: false
>  
> +allOf:
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: mediatek,mt8183-audiosys
> +    then:
> +      properties:
> +        audio-controller:
> +          $ref: /schemas/sound/mt8183-afe-pcm.yaml#
> +    else:
> +      properties:
> +        audio-controller:
> +          $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
> +
>  examples:
>    - |
>      #include <dt-bindings/interrupt-controller/arm-gic.h>
> 
> -- 
> 2.50.1
>
Re: [PATCH 2/9] dt-bindings: arm: mediatek: Support mt8183-audiosys binding variant
Posted by Julien Massot 1 month, 2 weeks ago
Hi Rob,
On Fri, 2025-08-01 at 12:21 -0500, Rob Herring wrote:
> On Fri, Aug 01, 2025 at 01:18:04PM +0200, Julien Massot wrote:
> > Update the mediatek,audsys binding to support the mt8183-audiosys
> > compatible, which uses a different audio controller binding
> > (mt8183-afe-pcm.yaml) compared to the legacy mt2701-audio controller.
> 
> Looks like this one needs 'memory-region' added?
Correct, I will add 'memory-region' in v2.

Regards,
Julien
Re: [PATCH 2/9] dt-bindings: arm: mediatek: Support mt8183-audiosys binding variant
Posted by AngeloGioacchino Del Regno 2 months ago
Il 01/08/25 13:18, Julien Massot ha scritto:
> Update the mediatek,audsys binding to support the mt8183-audiosys
> compatible, which uses a different audio controller binding
> (mt8183-afe-pcm.yaml) compared to the legacy mt2701-audio controller.
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>
> ---
>   .../bindings/arm/mediatek/mediatek,audsys.yaml          | 17 ++++++++++++++++-
>   1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> index 45d4a6620041b11cf6e943de49a42f3fcd91e1b9..5d9d91f9c5802240ac7d411c5632ae6663d15f29 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> @@ -23,6 +23,7 @@ properties:
>                 - mediatek,mt7622-audsys
>                 - mediatek,mt8167-audsys
>                 - mediatek,mt8173-audsys
> +              - mediatek,mt8183-audiosys
>                 - mediatek,mt8183-audsys
>                 - mediatek,mt8186-audsys
>                 - mediatek,mt8192-audsys
> @@ -41,7 +42,6 @@ properties:
>       const: 1
>   
>     audio-controller:
> -    $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
>       type: object
>   
>   required:
> @@ -50,6 +50,21 @@ required:
>   
>   additionalProperties: false
>   
> +allOf:

I think you can do it without the allOf here as well.

if:
   properties:
     compatible:
       contains...
then:
   properties
     ...
else:
  ... etc

after which

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: mediatek,mt8183-audiosys
> +    then:
> +      properties:
> +        audio-controller:
> +          $ref: /schemas/sound/mt8183-afe-pcm.yaml#
> +    else:
> +      properties:
> +        audio-controller:
> +          $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
> +
>   examples:
>     - |
>       #include <dt-bindings/interrupt-controller/arm-gic.h>
>
Re: [PATCH 2/9] dt-bindings: arm: mediatek: Support mt8183-audiosys binding variant
Posted by Julien Massot 1 month, 2 weeks ago
Hi Angelo,

On Mon, 2025-08-04 at 09:59 +0200, AngeloGioacchino Del Regno wrote:
> Il 01/08/25 13:18, Julien Massot ha scritto:
> > Update the mediatek,audsys binding to support the mt8183-audiosys
> > compatible, which uses a different audio controller binding
> > (mt8183-afe-pcm.yaml) compared to the legacy mt2701-audio controller.
> > 
> > Signed-off-by: Julien Massot <julien.massot@collabora.com>
> > ---
> >   .../bindings/arm/mediatek/mediatek,audsys.yaml          | 17 ++++++++++++++++-
> >   1 file changed, 16 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> > b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> > index 45d4a6620041b11cf6e943de49a42f3fcd91e1b9..5d9d91f9c5802240ac7d411c5632ae6663d15f29 100644
> > --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> > +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
> > @@ -23,6 +23,7 @@ properties:
> >                 - mediatek,mt7622-audsys
> >                 - mediatek,mt8167-audsys
> >                 - mediatek,mt8173-audsys
> > +              - mediatek,mt8183-audiosys
> >                 - mediatek,mt8183-audsys
> >                 - mediatek,mt8186-audsys
> >                 - mediatek,mt8192-audsys
> > @@ -41,7 +42,6 @@ properties:
> >       const: 1
> >   
> >     audio-controller:
> > -    $ref: /schemas/sound/mediatek,mt2701-audio.yaml#
> >       type: object
> >   
> >   required:
> > @@ -50,6 +50,21 @@ required:
> >   
> >   additionalProperties: false
> >   
> > +allOf:
> 
> I think you can do it without the allOf here as well.
> 
> if:
>    properties:
>      compatible:
>        contains...
> then:
>    properties
>      ...
> else:
>   ... etc
> 
> after which
> 
> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Indeed allOf is not needed here, will be fixed in v2 and will add your R-B.

Regards,
Julien