Skip to content

Commit 4b61666

Browse files
committed
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
2 parents 7a405db + f145845 commit 4b61666

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ title: APM X-Gene 6.0 Gb/s SATA host controller
99
maintainers:
1010
- Rob Herring <[email protected]>
1111

12-
allOf:
13-
- $ref: ahci-common.yaml#
14-
1512
properties:
1613
compatible:
1714
enum:
1815
- apm,xgene-ahci
19-
- apm,xgene-ahci-pcie
16+
- apm,xgene-ahci-v2
2017

2118
reg:
2219
minItems: 4
@@ -35,12 +32,22 @@ properties:
3532

3633
required:
3734
- compatible
38-
- clocks
39-
- phys
40-
- phy-names
4135

4236
unevaluatedProperties: false
4337

38+
allOf:
39+
- $ref: ahci-common.yaml#
40+
- if:
41+
properties:
42+
compatible:
43+
contains:
44+
const: apm,xgene-ahci
45+
then:
46+
required:
47+
- clocks
48+
- phys
49+
- phy-names
50+
4451
examples:
4552
- |
4653
sata@1a400000 {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ properties:
8080
power-domains:
8181
maxItems: 1
8282

83+
target-supply:
84+
description: Power regulator for the SATA target device.
85+
8386
required:
8487
- compatible
8588
- reg

Documentation/devicetree/bindings/ata/sata_highbank.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ examples:
8585
dma-coherent;
8686
calxeda,port-phys = <&combophy5 0>, <&combophy0 0>, <&combophy0 1>,
8787
<&combophy0 2>, <&combophy0 3>;
88-
calxeda,sgpio-gpio =<&gpioh 5 1>, <&gpioh 6 1>, <&gpioh 7 1>;
88+
calxeda,sgpio-gpio = <&gpioh 5 1>, <&gpioh 6 1>, <&gpioh 7 1>;
8989
calxeda,led-order = <4 0 1 2 3>;
9090
calxeda,tx-atten = <0xff 22 0xff 0xff 23>;
9191
calxeda,pre-clocks = <10>;

0 commit comments

Comments
 (0)