Skip to content

Commit 4c06765

Browse files
committed
Merge tag 'mvebu-dt64-6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.13 (part 1) armada-*: Drop undocumented SATA phy names * tag 'mvebu-dt64-6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: marvell: Drop undocumented SATA phy names Link: https://lore.kernel.org/r/878qtu83vh.fsf@BLaptop.bootlin.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4bdb783 + facbe70 commit 4c06765

6 files changed

Lines changed: 0 additions & 9 deletions

File tree

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

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

215215
sata-port@1 {
216216
phys = <&cp0_comphy3 1>;
217-
phy-names = "cp0-sata0-1-phy";
218217
};
219218
};
220219

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

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

439438
/* M.2-2250 B-key (J39) */
440439
sata-port@1 {
441440
phys = <&cp0_comphy3 1>;
442-
phy-names = "cp0-sata0-1-phy";
443441
};
444442
};
445443

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

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

476476
sata-port@1 {
477477
phys = <&cp1_comphy0 1>;
478-
phy-names = "cp1-sata0-1-phy";
479478
};
480479
};
481480

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

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

146146
sata-port@0 {
147147
phys = <&cp0_comphy1 0>;
148-
phy-names = "cp0-sata0-0-phy";
149148
};
150149
sata-port@1 {
151150
phys = <&cp0_comphy3 1>;
152-
phy-names = "cp0-sata0-1-phy";
153151
};
154152
};
155153

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@
245245
/* CPM Lane 5 - U29 */
246246
sata-port@1 {
247247
phys = <&cp0_comphy5 1>;
248-
phy-names = "cp0-sata0-1-phy";
249248
};
250249
};
251250

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

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

409409
sata-port@0 {
410410
phys = <&cp0_comphy2 0>;
411-
phy-names = "cp0-sata0-0-phy";
412411
};
413412

414413
sata-port@1 {
415414
phys = <&cp0_comphy5 1>;
416-
phy-names = "cp0-sata0-1-phy";
417415
};
418416
};
419417

0 commit comments

Comments
 (0)