arm64: dts: rockchip: Fix the common combophy + SATA on

A patch from »Support for QNAP TS133 variant« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko@...> Date: Sat, 3 Jan 2026 23:35:49 +0100

Commit-Message

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@...>

Patch-Comment

arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233.dts | 6 +++--- arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 6 +++--- arch/arm64/boot/dts/rockchip/rk3568-qnap-tsx33.dtsi | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-)

Statistics

  • 11 lines added
  • 11 lines removed

Changes

-------------- arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233.dts --------------
index 9a7d58e7ccc0..e76502180788 100644
@@ -18,8 +18,8 @@ aliases {
};
};
-/* connected to sata2 */
-&combphy2 {
+/* Connected to usb_host0_xhci */
+&combphy0 {
status = "okay";
};
@@ -93,7 +93,7 @@ hdd2_led_pin: hdd2-led-pin {
};
};
-&sata2 {
+&sata1 {
status = "okay";
};
-------------- arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts --------------
index 02d0974d79be..708e7f1f8d0d 100644
@@ -28,8 +28,8 @@ vcc3v3_pcie: regulator-vcc3v3-pcie {
};
};
-/* connected to sata2 */
-&combphy2 {
+/* Connected to usb_host0_xhci */
+&combphy0 {
status = "okay";
};
@@ -151,7 +151,7 @@ hdd4_led_pin: hdd4_led-pin {
};
};
-&sata2 {
+&sata1 {
status = "okay";
};
------------- arch/arm64/boot/dts/rockchip/rk3568-qnap-tsx33.dtsi --------------
index c372ca40fd50..482d8584ec88 100644
@@ -112,13 +112,13 @@ vcc5v0_usb: regulator-vcc5v0-usb {
};
};
-/* connected to usb_host0_xhci */
-&combphy0 {
+/* Connected USB3 on TS133 / SATA1 on all the others */
+&combphy1 {
status = "okay";
};
-/* connected to sata1 */
-&combphy1 {
+/* Connected to SATA2 */
+&combphy2 {
status = "okay";
};
@@ -484,7 +484,7 @@ &pmu_io_domains {
status = "okay";
};
-&sata1 {
+&sata2 {
status = "okay";
};
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...