github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-21 21:37:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mvebu dt64 for 6.14 (part 1)

Browse Source 
Fix errors reported by dtbs_check for sata related nodes
 Fix cp1 comphy link on Marvell CN913x platforms
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCZ4E2EAAKCRALBhiOFHI7
 1Q0bAJ4/7Dp0kQeWAutADvoGK2yUQOWj9wCeJ/lHO4tr+weMTRuHmxAjtt1tjCA=
 =BqFW
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmeJJ9EACgkQYKtH/8kJ
 Uic8uhAAkcOtIlnrhX2J6OIQOHDP5Ly5xfhkOcmO/9gA79S695ivlTo5KrZUonXj
 E0MZ0kMqFSDn3MOL5dCkt+KkDenyvLZmha72LeibY4iCCgYlaA9zhhmNcr4wYck1
 uNWw3/PGOHyiC5BmYsA+fkJ50H5es0XatZuATdHz8Qsd9eJ0+ELNOBeJUe/TatY/
 oCW88MKFhFz5vpgqBE3R8dXk+dnE4JhpUkG+KH2OM5LKihL6z6PD05flqSexGjZc
 ehWHP6P7bvBMfNH7d5RdBoeCdtMyBP7BiqNNLcmz2wXlXNRi6sk5XkxPvCRqHFEI
 aNjRHwr5dFzMY8AD6WBQtKZON1ZWerPUcgWI9/NCUFzY6RnpvCm7sYQa1STy8gun
 47KktkV+utm6qUgPl6PMIoYgexaNP3WsAP1Ljw65i1F+mYAT2CCf1unNv6nUb7PH
 AkmgYxmYyYs3IJDMb/Fp4A/dEKnaDUS3j4jupOv0zAJ0cypbJt9uXEaKEHoGTajK
 VGasPa1F1It26nwdA7uRMVCEaYuhZZ15xZNMUKZsfiBQUHUrBrSDiNfABEPlHVcJ
 negRvDOlCwbl1FEyd+D9lEnoEm/4/O/d1siKci0+QC34d4k/HKknmrCXju7IIQBT
 yCzu8ETkfemWzTTLzbxxJB9vf7AWm/7D6hDysxryJP9f24s6t04=
 =6EbJ
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2025-01-16 16:37:41 +01:00
commit dec61b88d9
11 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/marvell/armada-7040-db.dts
View File

@ -214,6 +214,7 @@ &cp0_sata0 {
sata-port@1 {
phys = <&cp0_comphy3 1>;
status = "okay";
};
};

2
arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
View File

@ -433,11 +433,13 @@ &cp0_sata0 {
/* 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";
};
};

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

@ -475,6 +475,7 @@ &cp1_sata0 {
sata-port@1 {
phys = <&cp1_comphy0 1>;
status = "okay";
};
};

5
arch/arm64/boot/dts/marvell/armada-8040-db.dts
View File

@ -145,9 +145,12 @@ &cp0_sata0 {
sata-port@0 {
phys = <&cp0_comphy1 0>;
status = "okay";
};
sata-port@1 {
phys = <&cp0_comphy3 1>;
status = "okay";
};
};
@ -304,11 +307,9 @@ &cp1_sata0 {
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";
};
};

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

@ -245,6 +245,7 @@ &cp0_sata0 {
/* CPM Lane 5 - U29 */
sata-port@1 {
phys = <&cp0_comphy5 1>;
status = "okay";
};
};
@ -344,13 +345,11 @@ &cp1_sata0 {
/* 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";
};
};

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

@ -408,10 +408,12 @@ &cp0_sata0 {
sata-port@0 {
phys = <&cp0_comphy2 0>;
status = "okay";
};
sata-port@1 {
phys = <&cp0_comphy5 1>;
status = "okay";
};
};

2
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
View File

@ -347,10 +347,12 @@ CP11X_LABEL(sata0): sata@540000 {
sata-port@0 {
reg = <0>;
status = "disabled";
};
sata-port@1 {
reg = <1>;
status = "disabled";
};
};

1
arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
View File

@ -28,6 +28,7 @@ sata-port@0 {
status = "okay";
/* Generic PHY, providing serdes lanes */
phys = <&cp0_comphy2 0>;
status = "okay";
};
};

4
arch/arm64/boot/dts/marvell/cn9131-cf-solidwan.dts
View File

@ -435,7 +435,7 @@ &cp1_eth1 {
managed = "in-band-status";
phy-mode = "sgmii";
phy = <&cp1_phy0>;
phys = <&cp0_comphy3 1>;
phys = <&cp1_comphy3 1>;
status = "okay";
};
@ -444,7 +444,7 @@ &cp1_eth2 {
managed = "in-band-status";
phy-mode = "sgmii";
phy = <&cp1_phy1>;
phys = <&cp0_comphy5 2>;
phys = <&cp1_comphy5 2>;
status = "okay";
};

1
arch/arm64/boot/dts/marvell/cn9131-db.dtsi
View File

@ -127,6 +127,7 @@ &cp1_sata0 {
sata-port@1 {
/* Generic PHY, providing serdes lanes */
phys = <&cp1_comphy5 1>;
status = "okay";
};
};

1
arch/arm64/boot/dts/marvell/cn9132-db.dtsi
View File

@ -175,6 +175,7 @@ &cp2_sata0 {
sata-port@0 {
/* Generic PHY, providing serdes lanes */
phys = <&cp2_comphy2 0>;
status = "okay";
};
};