Commit 4b616669 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux 

Pull ata updates from Damien Le Moal:

 - Improve the DT bindings documentation for the highbanck, imx and
   xgene-ahci controllers (Krzysztof, Fabio, Rob)

* tag 'ata-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  dt-bindings: ata: apm,xgene-ahci: Add apm,xgene-ahci-v2 support
  dt-bindings: ata: imx: Document 'target-supply'
  dt-bindings: ata: highbank: Minor whitespace cleanup in example
parents 7a405dbb f145845d

Documentation/devicetree/bindings/ata/apm,xgene-ahci.yaml

+14 −7
Original line number Diff line number Diff line
@@ -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



unevaluatedProperties: false



allOf:

  - $ref: ahci-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            const: apm,xgene-ahci

    then:

      required:

        - clocks

        - phys

        - phy-names



unevaluatedProperties: false



examples:

  - |

    sata@1a400000 {

Documentation/devicetree/bindings/ata/imx-sata.yaml

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ properties: 
  power-domains:

    maxItems: 1



  target-supply:

    description: Power regulator for the SATA target device.



required:

  - compatible

  - reg

Documentation/devicetree/bindings/ata/sata_highbank.yaml

+1 −1

File changed.

Contains only whitespace changes.