linux-kernel - [PATCH 15/37] dt-bindings: nvme: apple: Add apple,t6020-nvme-ans2 compatible

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250828-dt-apple-t6020-v1-15-507ba4c4b98e@jannau.net>
Date: Thu, 28 Aug 2025 16:01:34 +0200
From: Janne Grunau <j@...nau.net>
To: Sven Peter <sven@...nel.org>, Alyssa Rosenzweig <alyssa@...enzweig.io>,
  Neal Gompa <neal@...pa.dev>, Rob Herring <robh@...nel.org>,
  Krzysztof Kozlowski <krzk+dt@...nel.org>,
  Conor Dooley <conor+dt@...nel.org>, Hector Martin <marcan@...can.st>,
  "Rafael J. Wysocki" <rafael@...nel.org>,
  Viresh Kumar <viresh.kumar@...aro.org>,
  Thomas Gleixner <tglx@...utronix.de>, Joerg Roedel <joro@...tes.org>,
  Will Deacon <will@...nel.org>, Robin Murphy <robin.murphy@....com>,
  Linus Walleij <linus.walleij@...aro.org>,
  Mark Kettenis <kettenis@...nbsd.org>,
 Andi Shyti <andi.shyti@...nel.org>,
  Jassi Brar <jassisinghbrar@...il.com>,
  Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
  Maxime Ripard <mripard@...nel.org>,
 Thomas Zimmermann <tzimmermann@...e.de>,
  David Airlie <airlied@...il.com>, Simona Vetter <simona@...ll.ch>,
  Sasha Finkelstein <fnkl.kernel@...il.com>,
  Marcel Holtmann <marcel@...tmann.org>,
  Luiz Augusto von Dentz <luiz.dentz@...il.com>,
  Johannes Berg <johannes@...solutions.net>,
 van Spriel <arend@...adcom.com>,  Lee Jones <lee@...nel.org>,
  Uwe Kleine-König <ukleinek@...nel.org>,
  Stephen Boyd <sboyd@...nel.org>,
 Wim Van Sebroeck <wim@...ux-watchdog.org>,
  Guenter Roeck <linux@...ck-us.net>,
  Michael Turquette <mturquette@...libre.com>,
  Martin Povišer <povik+lin@...ebit.org>,
  Vinod Koul <vkoul@...nel.org>, Liam Girdwood <lgirdwood@...il.com>,
  Mark Brown <broonie@...nel.org>, Marc Zyngier <maz@...nel.org>,
  Ulf Hansson <ulf.hansson@...aro.org>, Keith Busch <kbusch@...nel.org>,
  Jens Axboe <axboe@...nel.dk>, Christoph Hellwig <hch@....de>,
  Sagi Grimberg <sagi@...mberg.me>, Jaroslav Kysela <perex@...ex.cz>,
  Takashi Iwai <tiwai@...e.com>
Cc: asahi@...ts.linux.dev, linux-arm-kernel@...ts.infradead.org, 
 devicetree@...r.kernel.org, linux-kernel@...r.kernel.org, 
 linux-pm@...r.kernel.org, iommu@...ts.linux.dev, linux-gpio@...r.kernel.org, 
 linux-i2c@...r.kernel.org, dri-devel@...ts.freedesktop.org, 
 linux-bluetooth@...r.kernel.org, linux-wireless@...r.kernel.org, 
 linux-pwm@...r.kernel.org, linux-watchdog@...r.kernel.org, 
 linux-clk@...r.kernel.org, dmaengine@...r.kernel.org, 
 linux-sound@...r.kernel.org, linux-spi@...r.kernel.org, 
 linux-nvme@...ts.infradead.org, Janne Grunau <j@...nau.net>
Subject: [PATCH 15/37] 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/

Signed-off-by: Janne Grunau <j@...nau.net>
---
 .../devicetree/bindings/nvme/apple,nvme-ans.yaml   | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
index fc6555724e1858e8a16f6750302ff0ad9c4e5b88..fedfacbca93714d988310f53a0a4c951d9342a61 100644
--- a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
+++ b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
@@ -11,12 +11,17 @@ maintainers:

 properties:
   compatible:
-    items:
-      - enum:
-          - apple,t8103-nvme-ans2
-          - apple,t8112-nvme-ans2
-          - apple,t6000-nvme-ans2
-      - const: apple,nvme-ans2
+    oneOf:
+      - 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
+          - const: apple,nvme-ans2

   reg:
     items:
@@ -67,20 +72,20 @@ if:
     compatible:
       contains:
         enum:
-          - 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

-- 
2.51.0