Skip to content

Commit 3002387

Browse files
frank-wgclement
authored andcommitted
arm64: dts: marvell: only enable complete sata nodes
The ahci-platform binding requires phys/target-supply property. After converting the binding to yaml the following files reporting "'anyOf' conditional failed" on sata@540000: sata-port@0 armada-7040-db.dts armada-8040-clearfog-gt-8k.dts armada-8040-mcbin.dts armada-8040-mcbin-singleshot.dts cn9130-db.dts cn9130-db-B.dts cn9131-db.dts cn9131-db-B.dts cn9132-db.dts cn9132-db-B.dts the following files reporting 'anyOf' conditional failed on sata@540000: sata-port@1 cn9132-db.dts cn9132-db-B.dts cn9130-crb-B.dts 'phys' is a required property 'target-supply' is a required property >From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml This is caused by defining sata-ports incomplete in armada-cp11x.dtsi and overriding only a subset of ports with the needed phys/target-supply property. Fix this by disabling the node-templates and enabling the needed nodes. Signed-off-by: Frank Wunderlich <frank-w@public-files.de> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent 09cdb97 commit 3002387

10 files changed

+15
-0
lines changed

arch/arm64/boot/dts/marvell/armada-7040-db.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214

215215
sata-port@1 {
216216
phys = <&cp0_comphy3 1>;
217+
status = "okay";
217218
};
218219
};
219220

arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,13 @@
433433
/* 7 + 12 SATA connector (J24) */
434434
sata-port@0 {
435435
phys = <&cp0_comphy2 0>;
436+
status = "okay";
436437
};
437438

438439
/* M.2-2250 B-key (J39) */
439440
sata-port@1 {
440441
phys = <&cp0_comphy3 1>;
442+
status = "okay";
441443
};
442444
};
443445

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@
475475

476476
sata-port@1 {
477477
phys = <&cp1_comphy0 1>;
478+
status = "okay";
478479
};
479480
};
480481

arch/arm64/boot/dts/marvell/armada-8040-db.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,12 @@
145145

146146
sata-port@0 {
147147
phys = <&cp0_comphy1 0>;
148+
status = "okay";
148149
};
150+
149151
sata-port@1 {
150152
phys = <&cp0_comphy3 1>;
153+
status = "okay";
151154
};
152155
};
153156

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@
245245
/* CPM Lane 5 - U29 */
246246
sata-port@1 {
247247
phys = <&cp0_comphy5 1>;
248+
status = "okay";
248249
};
249250
};
250251

arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,12 @@
408408

409409
sata-port@0 {
410410
phys = <&cp0_comphy2 0>;
411+
status = "okay";
411412
};
412413

413414
sata-port@1 {
414415
phys = <&cp0_comphy5 1>;
416+
status = "okay";
415417
};
416418
};
417419

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,12 @@
347347

348348
sata-port@0 {
349349
reg = <0>;
350+
status = "disabled";
350351
};
351352

352353
sata-port@1 {
353354
reg = <1>;
355+
status = "disabled";
354356
};
355357
};
356358

arch/arm64/boot/dts/marvell/cn9130-crb-B.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
status = "okay";
2929
/* Generic PHY, providing serdes lanes */
3030
phys = <&cp0_comphy2 0>;
31+
status = "okay";
3132
};
3233
};
3334

arch/arm64/boot/dts/marvell/cn9131-db.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
sata-port@1 {
128128
/* Generic PHY, providing serdes lanes */
129129
phys = <&cp1_comphy5 1>;
130+
status = "okay";
130131
};
131132
};
132133

arch/arm64/boot/dts/marvell/cn9132-db.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
sata-port@0 {
176176
/* Generic PHY, providing serdes lanes */
177177
phys = <&cp2_comphy2 0>;
178+
status = "okay";
178179
};
179180
};
180181

0 commit comments

Comments
 (0)