[PATCH master 1/3] ARM: rockchip: rk3568-qnap-ts433eu: re-enable combphy0, disable sata2

[Ahmad Fatoum]

From: Ahmad Fatoum <a.fatoum at barebox.org>

Linux commit 5a16e131ddba ("arm64: dts: rockchip: Fix the common
combophy + SATA on QNAP TSx33 devices"), imported with the v7.0-rc1
dts sync, moved the combphy0 enablement out of the shared
rk3568-qnap-tsx33.dtsi into the TS-233/TS-433 board files and swapped
which SATA controller is enabled where: the dtsi now enables sata2
(+ combphy2) and the boards enable sata1.

Enable combphy0 like upstream now does for the TS-433 and move the
SATA override to sata2, restoring the pre-sync state of the DT.

Fixes: fe223ba39321 ("dts: update to v7.0-rc1")
Assisted-by: Claude:opus-5.5
Signed-off-by: Ahmad Fatoum <a.fatoum at barebox.org>
---
 arch/arm/dts/rk3568-qnap-ts433eu.dts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/rk3568-qnap-ts433eu.dts b/arch/arm/dts/rk3568-qnap-ts433eu.dts
index be0455abfe65..ea98b6819db8 100644
--- a/arch/arm/dts/rk3568-qnap-ts433eu.dts
+++ b/arch/arm/dts/rk3568-qnap-ts433eu.dts
@@ -27,6 +27,11 @@ vcc3v3_pcie: regulator-vcc3v3-pcie {
 	};
 };
 
+/* Connected to usb_host0_xhci */
+&combphy0 {
+	status = "okay";
+};
+
 &combphy2 {
 	status = "okay";
 };
@@ -94,7 +99,7 @@ &pcie3x2 {
 };
 
 /* Internal SATA controllers not used, ASM1064 used instead */
-&sata1 {
+&sata2 {
 	status = "disabled";
 };
 
-- 
2.47.3