From: Rob Herring (Arm) <robh@kernel.org>
Date: Fri, 19 Sep 2025 22:35:31 +0000 (-0500)
Subject: dt-bindings: ata: apm,xgene-ahci: Add apm,xgene-ahci-v2 support
X-Git-Tag: v6.18-rc1~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f145845d8348c9b6288df41cb7904fd9fde566dc;p=thirdparty%2Fkernel%2Fstable.git

dt-bindings: ata: apm,xgene-ahci: Add apm,xgene-ahci-v2 support

The "apm,xgene-ahci-v2" compatible has been in use for a long time, but
was undocumented. It doesn't require clocks or phys.

Remove the "apm,xgene-ahci-pcie" compatible which isn't used anywhere
while we're here.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---

diff --git a/Documentation/devicetree/bindings/ata/apm,xgene-ahci.yaml b/Documentation/devicetree/bindings/ata/apm,xgene-ahci.yaml
index 7dc9428086561..dc631381f9e1e 100644
--- a/Documentation/devicetree/bindings/ata/apm,xgene-ahci.yaml
+++ b/Documentation/devicetree/bindings/ata/apm,xgene-ahci.yaml
@@ -9,14 +9,11 @@ title: APM X-Gene 6.0 Gb/s SATA host controller
 maintainers:
   - Rob Herring <robh@kernel.org>
 
-allOf:
-  - $ref: ahci-common.yaml#
-
 properties:
   compatible:
     enum:
       - apm,xgene-ahci
-      - apm,xgene-ahci-pcie
+      - apm,xgene-ahci-v2
 
   reg:
     minItems: 4
@@ -35,12 +32,22 @@ properties:
 
 required:
   - compatible
-  - clocks
-  - phys
-  - phy-names
 
 unevaluatedProperties: false
 
+allOf:
+  - $ref: ahci-common.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apm,xgene-ahci
+    then:
+      required:
+        - clocks
+        - phys
+        - phy-names
+
 examples:
   - |
     sata@1a400000 {