Skip to content

Commit d3021e6

Browse files
Josua-SRgclement
authored andcommitted
arm64: dts: marvell: cn913x-solidrun: fix sata ports status
Commit "arm64: dts: marvell: only enable complete sata nodes" changed armada-cp11x.dtsi disabling all sata ports status by default. The author missed some dts which relied on the dtsi enabling all ports, and just disabled unused ones instead. Update dts for SolidRun cn913x based boards to enable the available ports, rather than disabling the unvavailable one. Further according to dt bindings the serdes phys are to be specified in the port node, not the controller node. Move those phys properties accordingly in clearfog base/pro/solidwan. Fixes: 3002387 ("arm64: dts: marvell: only enable complete sata nodes") Cc: stable@vger.kernel.org Signed-off-by: Josua Mayer <josua@solid-run.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent 29341c6 commit d3021e6

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

arch/arm64/boot/dts/marvell/cn9130-cf.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,12 @@
152152

153153
/* SRDS #0 - SATA on M.2 connector */
154154
&cp0_sata0 {
155-
phys = <&cp0_comphy0 1>;
156155
status = "okay";
157156

158-
/* only port 1 is available */
159-
/delete-node/ sata-port@0;
157+
sata-port@1 {
158+
phys = <&cp0_comphy0 1>;
159+
status = "okay";
160+
};
160161
};
161162

162163
/* microSD */

arch/arm64/boot/dts/marvell/cn9131-cf-solidwan.dts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,11 +563,13 @@
563563

564564
/* SRDS #1 - SATA on M.2 (J44) */
565565
&cp1_sata0 {
566-
phys = <&cp1_comphy1 0>;
567566
status = "okay";
568567

569568
/* only port 0 is available */
570-
/delete-node/ sata-port@1;
569+
sata-port@0 {
570+
phys = <&cp1_comphy1 0>;
571+
status = "okay";
572+
};
571573
};
572574

573575
&cp1_syscon0 {

arch/arm64/boot/dts/marvell/cn9132-clearfog.dts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,9 @@
512512
status = "okay";
513513

514514
/* only port 1 is available */
515-
/delete-node/ sata-port@0;
516-
517515
sata-port@1 {
518516
phys = <&cp1_comphy3 1>;
517+
status = "okay";
519518
};
520519
};
521520

@@ -631,9 +630,8 @@
631630
status = "okay";
632631

633632
/* only port 1 is available */
634-
/delete-node/ sata-port@0;
635-
636633
sata-port@1 {
634+
status = "okay";
637635
phys = <&cp2_comphy3 1>;
638636
};
639637
};

0 commit comments

Comments
 (0)