Skip to content

Commit dec61b8

Browse files
committed
Merge tag 'mvebu-dt64-6.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.14 (part 1) Fix errors reported by dtbs_check for sata related nodes Fix cp1 comphy link on Marvell CN913x platforms * tag 'mvebu-dt64-6.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: marvell: drop additional phy-names for sata arm64: dts: marvell: only enable complete sata nodes arm64: dts: marvell: cn9131-cf-solidwan: fix cp1 comphy links Link: https://lore.kernel.org/r/87frlnygej.fsf@BLaptop.bootlin.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 116eda2 + a34c9fa commit dec61b8

11 files changed

+17
-6
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 & 2 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

@@ -304,11 +307,9 @@
304307

305308
sata-port@0 {
306309
phys = <&cp1_comphy1 0>;
307-
phy-names = "cp1-sata0-0-phy";
308310
};
309311
sata-port@1 {
310312
phys = <&cp1_comphy3 1>;
311-
phy-names = "cp1-sata0-1-phy";
312313
};
313314
};
314315

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

Lines changed: 1 addition & 2 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

@@ -344,13 +345,11 @@
344345
/* CPS Lane 1 - U32 */
345346
sata-port@0 {
346347
phys = <&cp1_comphy1 0>;
347-
phy-names = "cp1-sata0-0-phy";
348348
};
349349

350350
/* CPS Lane 3 - U31 */
351351
sata-port@1 {
352352
phys = <&cp1_comphy3 1>;
353-
phy-names = "cp1-sata0-1-phy";
354353
};
355354
};
356355

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-cf-solidwan.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@
435435
managed = "in-band-status";
436436
phy-mode = "sgmii";
437437
phy = <&cp1_phy0>;
438-
phys = <&cp0_comphy3 1>;
438+
phys = <&cp1_comphy3 1>;
439439
status = "okay";
440440
};
441441

@@ -444,7 +444,7 @@
444444
managed = "in-band-status";
445445
phy-mode = "sgmii";
446446
phy = <&cp1_phy1>;
447-
phys = <&cp0_comphy5 2>;
447+
phys = <&cp1_comphy5 2>;
448448
status = "okay";
449449
};
450450

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

0 commit comments

Comments
 (0)