mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@barebox.org>
Subject: [PATCH master 1/3] ARM: rockchip: rk3568-qnap-ts433eu: re-enable combphy0, disable sata2
Date: Thu, 15 Oct 2026 10:48:29 +0200	[thread overview]
Message-ID: <20261015084833.4090522-1-a.fatoum@pengutronix.de> (raw)

From: Ahmad Fatoum <a.fatoum@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@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




             reply	other threads:[~2026-10-15  9:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-15  8:48 Ahmad Fatoum [this message]
2026-10-15  8:48 ` [PATCH master 2/3] ARM: rpi: look up emmc2bus by alias for dma-ranges fixup Ahmad Fatoum
2026-10-15  8:48 ` [PATCH master 3/3] of: base: use default bus match table when populating /firmware Ahmad Fatoum
2026-10-15 11:36 ` [PATCH master 1/3] ARM: rockchip: rk3568-qnap-ts433eu: re-enable combphy0, disable sata2 Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261015084833.4090522-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=a.fatoum@barebox.org \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox