Skip to content

Commit 5a16e13

Browse files
committed
arm64: dts: rockchip: Fix the common combophy + SATA on QNAP TSx33 devices
The common used SATA controller on all TSx33 devices is actually SATA2. So move the SATA controller + combophy enablement to their correct position between shared dtsi and board devicetrees. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patch.msgid.link/20260104191448.2693309-3-heiko@sntech.de
1 parent f0761f6 commit 5a16e13

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
};
1919
};
2020

21-
/* connected to sata2 */
22-
&combphy2 {
21+
/* Connected to usb_host0_xhci */
22+
&combphy0 {
2323
status = "okay";
2424
};
2525

@@ -93,7 +93,7 @@
9393
};
9494
};
9595

96-
&sata2 {
96+
&sata1 {
9797
status = "okay";
9898
};
9999

arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
};
2929
};
3030

31-
/* connected to sata2 */
32-
&combphy2 {
31+
/* Connected to usb_host0_xhci */
32+
&combphy0 {
3333
status = "okay";
3434
};
3535

@@ -151,7 +151,7 @@
151151
};
152152
};
153153

154-
&sata2 {
154+
&sata1 {
155155
status = "okay";
156156
};
157157

arch/arm64/boot/dts/rockchip/rk3568-qnap-tsx33.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@
112112
};
113113
};
114114

115-
/* connected to usb_host0_xhci */
116-
&combphy0 {
115+
/* Connected USB3 on TS133 / SATA1 on all the others */
116+
&combphy1 {
117117
status = "okay";
118118
};
119119

120-
/* connected to sata1 */
121-
&combphy1 {
120+
/* Connected to SATA2 */
121+
&combphy2 {
122122
status = "okay";
123123
};
124124

@@ -484,7 +484,7 @@
484484
status = "okay";
485485
};
486486

487-
&sata1 {
487+
&sata2 {
488488
status = "okay";
489489
};
490490

0 commit comments

Comments
 (0)