Unverified Commit dec61b88 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-6.14-1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 116eda2e a34c9fac

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

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ &cp0_sata0 { 


	sata-port@1 {

		phys = <&cp0_comphy3 1>;

		status = "okay";

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -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";

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ &cp1_sata0 { 


	sata-port@1 {

		phys = <&cp1_comphy0 1>;

		status = "okay";

	};

};

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

+3 −2
Original line number Diff line number Diff line
@@ -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";

	};

};

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

+1 −2
Original line number Diff line number Diff line
@@ -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";

	};

};