averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-17 09:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mvebu-dt64-6.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2025-01-16 16:37:53 +01:00
parent 116eda2ec9 a34c9fac85
commit dec61b88d9
11 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/marvell/armada-7040-db.dts
+1
View File
@@ -214,6 +214,7 @@
sata-port@1 {
phys = <&cp0_comphy3 1>;
status = "okay";
};
};
arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+2
View File
@@ -433,11 +433,13 @@
/* 7 + 12 SATA connector (J24) */
sata-port@0 {
phys = <&cp0_comphy2 0>;
status = "okay";
};
/* M.2-2250 B-key (J39) */
sata-port@1 {
phys = <&cp0_comphy3 1>;
status = "okay";
};
};
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+1
View File
@@ -475,6 +475,7 @@
sata-port@1 {
phys = <&cp1_comphy0 1>;
status = "okay";
};
};
arch/arm64/boot/dts/marvell/armada-8040-db.dts
+3 -2
View File
@@ -145,9 +145,12 @@
sata-port@0 {
phys = <&cp0_comphy1 0>;
status = "okay";
};
sata-port@1 {
phys = <&cp0_comphy3 1>;
status = "okay";
};
};
@@ -304,11 +307,9 @@
sata-port@0 {
phys = <&cp1_comphy1 0>;
phy-names = "cp1-sata0-0-phy";
};
sata-port@1 {
phys = <&cp1_comphy3 1>;
phy-names = "cp1-sata0-1-phy";
};
};
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+1 -2
View File
@@ -245,6 +245,7 @@
/* CPM Lane 5 - U29 */
sata-port@1 {
phys = <&cp0_comphy5 1>;
status = "okay";
};
};
@@ -344,13 +345,11 @@
/* CPS Lane 1 - U32 */
sata-port@0 {
phys = <&cp1_comphy1 0>;
phy-names = "cp1-sata0-0-phy";
};
/* CPS Lane 3 - U31 */
sata-port@1 {
phys = <&cp1_comphy3 1>;
phy-names = "cp1-sata0-1-phy";
};
};
arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+2
View File
@@ -408,10 +408,12 @@
sata-port@0 {
phys = <&cp0_comphy2 0>;
status = "okay";
};
sata-port@1 {
phys = <&cp0_comphy5 1>;
status = "okay";
};
};
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+2
View File
@@ -347,10 +347,12 @@
sata-port@0 {
reg = <0>;
status = "disabled";
};
sata-port@1 {
reg = <1>;
status = "disabled";
};
};
arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
+1
View File
@@ -28,6 +28,7 @@
status = "okay";
/* Generic PHY, providing serdes lanes */
phys = <&cp0_comphy2 0>;
status = "okay";
};
};
arch/arm64/boot/dts/marvell/cn9131-cf-solidwan.dts
+2 -2
View File
@@ -435,7 +435,7 @@
managed = "in-band-status";
phy-mode = "sgmii";
phy = <&cp1_phy0>;
phys = <&cp0_comphy3 1>;
phys = <&cp1_comphy3 1>;
status = "okay";
};
@@ -444,7 +444,7 @@
managed = "in-band-status";
phy-mode = "sgmii";
phy = <&cp1_phy1>;
phys = <&cp0_comphy5 2>;
phys = <&cp1_comphy5 2>;
status = "okay";
};
arch/arm64/boot/dts/marvell/cn9131-db.dtsi
+1
View File
@@ -127,6 +127,7 @@
sata-port@1 {
/* Generic PHY, providing serdes lanes */
phys = <&cp1_comphy5 1>;
status = "okay";
};
};
arch/arm64/boot/dts/marvell/cn9132-db.dtsi
+1
View File
@@ -175,6 +175,7 @@
sata-port@0 {
/* Generic PHY, providing serdes lanes */
phys = <&cp2_comphy2 0>;
status = "okay";
};
};