From: Heiko Stuebner <heiko@sntech.de>
To: u-boot@lists.denx.de, kever.yang@rock-chips.com,
philipp.tomsich@vrull.eu, sjg@chromium.org
Cc: heiko@sntech.de, ukleinek@debian.org
Subject: [PATCH v3 02/18] arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433
Date: Mon, 28 Oct 2024 20:00:18 +0100 [thread overview]
Message-ID: <20241028190034.143122-3-heiko@sntech.de> (raw)
In-Reply-To: <20241028190034.143122-1-heiko@sntech.de>
The TS433 uses both pcie controllers for sata and the 2nd network
interface. Set the needed data-lanes in the pcie3 phy and enable
the second pcie controller, as well as remove the bifurcation comment.
Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20240723195538.1133436-3-heiko@sntech.de
[ upstream commit: 0f5f87a1d602a33028522784eb005647fa1b5c11 ]
(cherry picked from commit 7d8f260e65cc84076ec9456954de0f136948a2c8)
---
dts/upstream/src/arm64/rockchip/rk3568-qnap-ts433.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3568-qnap-ts433.dts b/dts/upstream/src/arm64/rockchip/rk3568-qnap-ts433.dts
index 07b4f095d76..9bf9c3b65ca 100644
--- a/dts/upstream/src/arm64/rockchip/rk3568-qnap-ts433.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3568-qnap-ts433.dts
@@ -78,17 +78,25 @@
};
&pcie30phy {
+ data-lanes = <1 2>;
status = "okay";
};
/* Connected to a JMicron AHCI SATA controller */
&pcie3x1 {
- /* The downstream dts has: rockchip,bifurcation, XXX: find out what this is about */
reset-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie>;
status = "okay";
};
+/* Connected to the 2.5G NIC for the upper network jack */
+&pcie3x2 {
+ num-lanes = <1>;
+ reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
+ vpcie3v3-supply = <&vcc3v3_pcie>;
+ status = "okay";
+};
+
&sdhci {
bus-width = <8>;
max-frequency = <200000000>;
--
2.45.2
next prev parent reply other threads:[~2024-10-28 19:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 19:00 [PATCH v3 00/18] Support for rk3568 based QNAP TS433 NAS Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 01/18] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` Heiko Stuebner [this message]
2024-10-28 19:00 ` [PATCH v3 03/18] arm64: dts: rockchip: enable uart0 on Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 04/18] arm64: dts: rockchip: enable usb ports " Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 05/18] arm64: dts: rockchip: add stdout path " Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 06/18] arm64: dts: rockchip: enable sata1+2 " Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 07/18] arm64: dts: rockchip: add board-aliases for Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 08/18] arm64: dts: rockchip: add hdd leds to Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 09/18] arm64: dts: rockchip: enable the tsadc on the Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 10/18] arm64: dts: rockchip: add gpio-keys to Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 11/18] arm64: dts: rockchip: define cpu-supply on the Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 12/18] arm64: dts: rockchip: add missing pmic information on Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 13/18] arm64: dts: rockchip: enable gpu " Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 14/18] arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 15/18] arm64: dts: rockchip: Simplify network PHY connection on qnap-ts433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 16/18] arm64: dts: rockchip: actually enable pmu-io-domains " Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 17/18] arm64: dts: rockchip: add product-data eeproms to QNAP TS433 Heiko Stuebner
2024-10-28 19:00 ` [PATCH v3 18/18] board: rockchip: add support for Qnap TS433 devices Heiko Stuebner
2024-10-30 6:23 ` Kever Yang
2024-11-08 10:32 ` Kever Yang
2024-11-11 10:12 ` Kever Yang
2024-11-11 10:16 ` Heiko Stübner
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=20241028190034.143122-3-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=kever.yang@rock-chips.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
--cc=ukleinek@debian.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