From: Janne Grunau <j@jannau.net>
Date: Thu, 28 Aug 2025 14:01:34 +0000 (+0200)
Subject: dt-bindings: nvme: apple: Add apple,t6020-nvme-ans2 compatible
X-Git-Tag: v6.18-rc1~145^2~8^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3ee3333467c076a1f0655dbe6d4950af360c3a5;p=thirdparty%2Fkernel%2Flinux.git

dt-bindings: nvme: apple: Add apple,t6020-nvme-ans2 compatible

After discussion with the devicetree maintainers we agreed to not extend
lists with the generic compatible "apple,nvme-ans2" anymore [1]. Add
"apple,t8103-nvme-ans2" as fallback compatible as it is the SoC the
driver and bindings were written for.

Invert the condition for the 2 or 3 power-domains check to allow using
"apple,t8103-nvme-ans2" as base compatible.

"apple,t6020-nvme-ans2" on Apple M2 Pro/Max/Ultra SoCs is compatible
with "apple,t8103-nvme-ans2" so add its per-SoC compatible.

[1]: https://lore.kernel.org/asahi/12ab93b7-1fc2-4ce0-926e-c8141cfe81bf@kernel.org/

Reviewed-by: Neal Gompa <neal@gompa.dev>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Janne Grunau <j@jannau.net>
---

diff --git a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
index 4127d7b0a0f06..4c0b1f90aff84 100644
--- a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
+++ b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
@@ -13,8 +13,12 @@ properties:
   compatible:
     oneOf:
       - const: apple,t8015-nvme-ans2
+      - items:
+          - const: apple,t6020-nvme-ans2
+          - const: apple,t8103-nvme-ans2
       - items:
           - enum:
+              # Do not add additional SoC to this list.
               - apple,t8103-nvme-ans2
               - apple,t8112-nvme-ans2
               - apple,t6000-nvme-ans2
@@ -69,21 +73,20 @@ if:
     compatible:
       contains:
         enum:
-          - apple,t8015-nvme-ans2
-          - apple,t8103-nvme-ans2
-          - apple,t8112-nvme-ans2
+          - apple,t6000-nvme-ans2
+          - apple,t6020-nvme-ans2
 then:
   properties:
     power-domains:
-      maxItems: 2
+      minItems: 3
     power-domain-names:
-      maxItems: 2
+      minItems: 3
 else:
   properties:
     power-domains:
-      minItems: 3
+      maxItems: 2
     power-domain-names:
-      minItems: 3
+      maxItems: 2
 
 required:
   - compatible