Merge tag 'ata-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

90af47ed · Linus Torvalds <[email protected]> · 2023-05-21 11:46:23 -07:00

Pull ata fix from Damien Le Moal:

 - Fix DT binding for the ahci-ceva driver to fully describe all iommus,
   from Michal

* tag 'ata-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  dt-bindings: ata: ahci-ceva: Cover all 4 iommus entries

Commit: 90af47edea473e5776989f4b669401552c7ca558
Parents: 70e137e3 · a7844528

Merge commit. Changes below are compared with the first parent: 70e137e3.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml	modified	+1	−1	View file

Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

View file

diff --git a/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml b/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml
index 9b31f86..71364c6 100644
--- a/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml
+++ b/Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml
@@ -32,7 +32,7 @@ properties:
     maxItems: 1
 
   iommus:
-    maxItems: 1
+    maxItems: 4
 
   power-domains:
     maxItems: 1