The Apple M2 SoC uses AICv2 and is compatible with the existing driver.
Add its per-SoC compatible.
Since multi-die versions of the M2 are not expected decrease
'#interrupt-cells' to 3 for apple,t8112-aic. This is seamlessly handled
inside the driver.

Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Janne Grunau <j@jannau.net>
---
 .../bindings/interrupt-controller/apple,aic2.yaml  | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml b/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml
index 06948c0e36a5..a99e7ed7c750 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml
@@ -31,19 +31,22 @@ description: |
 properties:
   compatible:
     items:
-      - const: apple,t6000-aic
+      - enum:
+          - apple,t8112-aic
+          - apple,t6000-aic
       - const: apple,aic2
 
   interrupt-controller: true
 
   '#interrupt-cells':
-    const: 4
+    minimum: 3
+    maximum: 4
     description: |
       The 1st cell contains the interrupt type:
         - 0: Hardware IRQ
         - 1: FIQ
 
-      The 2nd cell contains the die ID.
+      The 2nd cell contains the die ID (only present on apple,t6000-aic).
 
       The next cell contains the interrupt number.
         - HW IRQs: interrupt number
@@ -110,6 +113,20 @@ additionalProperties: false
 allOf:
   - $ref: /schemas/interrupt-controller.yaml#
 
+if:
+  properties:
+    compatible:
+      contains:
+        const: apple,t8112-aic
+then:
+  properties:
+    '#interrupt-cells':
+      const: 3
+else:
+  properties:
+    '#interrupt-cells':
+      const: 4
+
 examples:
   - |
     soc {

-- 
2.39.1

On 14/02/2023 12:03, Janne Grunau wrote:
> The Apple M2 SoC uses AICv2 and is compatible with the existing driver.
> Add its per-SoC compatible.
> Since multi-die versions of the M2 are not expected decrease
> '#interrupt-cells' to 3 for apple,t8112-aic. This is seamlessly handled
> inside the driver.
> 

Thank you for your patch. There is something to discuss/improve.

>  
> -      The 2nd cell contains the die ID.
> +      The 2nd cell contains the die ID (only present on apple,t6000-aic).
>  
>        The next cell contains the interrupt number.
>          - HW IRQs: interrupt number
> @@ -110,6 +113,20 @@ additionalProperties: false
>  allOf:
>    - $ref: /schemas/interrupt-controller.yaml#
>  
> +if:

This should be under "allOf" (as next entry so "  - if:").

> +  properties:
> +    compatible:
> +      contains:
> +        const: apple,t8112-aic
> +then:
> +  properties:
> +    '#interrupt-cells':
> +      const: 3
> +else:
> +  properties:
> +    '#interrupt-cells':
> +      const: 4
> +
>  examples:
>    - |
>      soc {
> 

Best regards,
Krzysztof