mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v3 00/14] Expand available features on Qnap TS433
@ 2024-07-23 19:55 Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 01/14] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433 Heiko Stuebner
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Thanks to the nicely supported rk3568, the hardest part for adding things,
is to pull things from the vendor-kernel and translating them to mainline
standards.

This series allows the TS433 to use all 4 bays [0], wiggle some LEDs and
access devices connected to all 3 usb ports.

The device runs stable now and might be usable for actual usage.

There is still a todo-list though:
- the ethernet mac address for the realtek chip seems correct,
  but the gmac0 interface currently uses a wrong one
- i2cdetect reports devices on i2c-1 on addresses 54,55,56,57
  model_Q0B20_Q0B30_10_10.conf from the original rescue image labels them
    VPD_MB = I2C:0x54, VPD_BP = I2C:0x56
  the meaning currently being unknown. Some eeprom maybe?
- The regulator tree is slightly dubious. Everthing seems to follow rk3568
  reference designs, but especially the regulator labeled vcc3v3_sd
  seems to supply some PCIe functionality. So I guess the device's
  schematics will look quite different than the regulators added to the
  vendor devicetree.
- Quite a bit of functionality is provided by the MCU connected to uart0.
  According to the model.conf there should be fan-control, a number of
  additional LEDs (status,locate,usb?)


Thanks to Qnap engineers adding an easily accessible header for maskrom
mode on the board, replacing the bootloader is also quite a breeze. A
branch on top of today's u-boot master branch can be found on [1]. I'll
submit that code to u-boot once I can cherry-pick the dts patches.

changes in v3:
- fix the two regulator node-names, I noticed after sending v2
- add Uwe's Tested-by tags
- fold in some of Uwe's suggestions:
  - remove some phandles
  - more comments to explain what is connected where
  - handle the two RTCs in the system, though not by hacking around
    to disable the pmic-one, instead just make sure the real one
    stays the first rtc
changes in v2:
- add patches for tsadc, gpio-keys, cpu-supply, pmic, gpu and io-domains


[0] I only have two drives right now, but I tested both the internal
sata connector as well as the PCIe connected sata controller in different
combinations.
[1] https://github.com/mmind/u-boot-rockchip/tree/dev/qnap-ts433/v2024.07

Heiko Stuebner (14):
  arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433
  arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433
  arm64: dts: rockchip: enable uart0 on Qnap-TS433
  arm64: dts: rockchip: enable usb ports on Qnap-TS433
  arm64: dts: rockchip: add stdout path on Qnap-TS433
  arm64: dts: rockchip: enable sata1+2 on Qnap-TS433
  arm64: dts: rockchip: add board-aliases for Qnap-TS433
  arm64: dts: rockchip: add hdd leds to Qnap-TS433
  arm64: dts: rockchip: enable the tsadc on the Qnap-TS433
  arm64: dts: rockchip: add gpio-keys to Qnap-TS433
  arm64: dts: rockchip: define cpu-supply on the Qnap-TS433
  arm64: dts: rockchip: add missing pmic information on Qnap-TS433
  arm64: dts: rockchip: enable gpu on Qnap-TS433
  arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433

 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 546 +++++++++++++++++-
 1 file changed, 543 insertions(+), 3 deletions(-)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 01/14] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 02/14] arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433 Heiko Stuebner
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Add the vcc3v3-supply regulator and its link to the pcie controllers.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 6a998166003c9..07b4f095d766a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -12,6 +12,25 @@
 / {
 	model = "Qnap TS-433-4G NAS System 4-Bay";
 	compatible = "qnap,ts433", "rockchip,rk3568";
+
+	dc_12v: regulator-dc-12v {
+		compatible = "regulator-fixed";
+		regulator-name = "dc_12v";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc3v3_pcie: regulator-vcc3v3-pcie {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		enable-active-high;
+		gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
+		vin-supply = <&dc_12v>;
+	};
 };
 
 &gmac0 {
@@ -62,9 +81,11 @@ &pcie30phy {
 	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";
 };
 
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 02/14] arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 01/14] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 03/14] arm64: dts: rockchip: enable uart0 on Qnap-TS433 Heiko Stuebner
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

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>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 07b4f095d766a..9bf9c3b65ca31 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -78,17 +78,25 @@ rgmii_phy0: ethernet-phy@0 {
 };
 
 &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.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 03/14] arm64: dts: rockchip: enable uart0 on Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 01/14] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433 Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 02/14] arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 04/14] arm64: dts: rockchip: enable usb ports " Heiko Stuebner
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Uart0 is connected to an MCU on the board that handles system control
like the fan-speed. So far no driver for it is available though.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 9bf9c3b65ca31..bc26f2e98c185 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -104,6 +104,14 @@ &sdhci {
 	status = "okay";
 };
 
+/*
+ * Connected to an MCU, that provides access to more LEDs,
+ * buzzer, fan control and more.
+ */
+&uart0 {
+	status = "okay";
+};
+
 /*
  * Pins available on CN3 connector at TTL voltage level (3V3).
  * ,_  _.
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 04/14] arm64: dts: rockchip: enable usb ports on Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (2 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 03/14] arm64: dts: rockchip: enable uart0 on Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 05/14] arm64: dts: rockchip: add stdout path " Heiko Stuebner
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Enable usb controllers and phys and add regulator infrastructure for the
usb ports on the TS433.

Of course there are no schematics available for the device, so the
regulator information comes from the vendor-devicetree with unknown
accuracy.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index bc26f2e98c185..da735c4764f4d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -31,6 +31,49 @@ vcc3v3_pcie: regulator-vcc3v3-pcie {
 		gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&dc_12v>;
 	};
+
+	vcc5v0_host: regulator-vcc5v0-host {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_host_en>;
+		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
+		regulator-name = "vcc5v0_host";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc5v0_usb>;
+	};
+
+	vcc5v0_otg: regulator-vcc5v0-otg {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_otg_en>;
+		regulator-name = "vcc5v0_otg";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc5v0_usb>;
+	};
+
+	vcc5v0_usb: regulator-vcc5v0-usb {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_usb";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&dc_12v>;
+	};
+};
+
+/* connected to usb_host0_xhci */
+&combphy0 {
+	status = "okay";
 };
 
 &gmac0 {
@@ -97,6 +140,18 @@ &pcie3x2 {
 	status = "okay";
 };
 
+&pinctrl {
+	usb {
+		vcc5v0_host_en: vcc5v0-host-en {
+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		vcc5v0_otg_en: vcc5v0-otg-en {
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
 &sdhci {
 	bus-width = <8>;
 	max-frequency = <200000000>;
@@ -121,3 +176,53 @@ &uart0 {
 &uart2 {
 	status = "okay";
 };
+
+&usb2phy0 {
+	status = "okay";
+};
+
+/* connected to usb_host0_xhci */
+&usb2phy0_otg {
+	phy-supply = <&vcc5v0_otg>;
+	status = "okay";
+};
+
+&usb2phy1 {
+	status = "okay";
+};
+
+/* connected to usb_host1_ehci/ohci */
+&usb2phy1_host {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+/* connected to usb_host0_ehci/ohci */
+&usb2phy1_otg {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+/* right port backside */
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+/* front port */
+&usb_host0_xhci {
+	dr_mode = "host";
+	status = "okay";
+};
+
+/* left port backside */
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 05/14] arm64: dts: rockchip: add stdout path on Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (3 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 04/14] arm64: dts: rockchip: enable usb ports " Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 06/14] arm64: dts: rockchip: enable sata1+2 " Heiko Stuebner
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

As most Rockchip boards do, the TS433 also uses uart2 for its serial
output. Set the correct chosen entry for it.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index da735c4764f4d..be1c2286c2d3f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -13,6 +13,10 @@ / {
 	model = "Qnap TS-433-4G NAS System 4-Bay";
 	compatible = "qnap,ts433", "rockchip,rk3568";
 
+	chosen {
+		stdout-path = "serial2:115200n8";
+	};
+
 	dc_12v: regulator-dc-12v {
 		compatible = "regulator-fixed";
 		regulator-name = "dc_12v";
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 06/14] arm64: dts: rockchip: enable sata1+2 on Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (4 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 05/14] arm64: dts: rockchip: add stdout path " Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 07/14] arm64: dts: rockchip: add board-aliases for Qnap-TS433 Heiko Stuebner
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

The TS433 has 4 bays. The last two are accessed via a pci-connected
sata controller, while the first two are accessed via the rk3568's
sata controllers. Enable these two now.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index be1c2286c2d3f..40af4dd0e4158 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -80,6 +80,16 @@ &combphy0 {
 	status = "okay";
 };
 
+/* connected to sata1 */
+&combphy1 {
+	status = "okay";
+};
+
+/* connected to sata2 */
+&combphy2 {
+	status = "okay";
+};
+
 &gmac0 {
 	assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
 	assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>;
@@ -156,6 +166,14 @@ vcc5v0_otg_en: vcc5v0-otg-en {
 	};
 };
 
+&sata1 {
+	status = "okay";
+};
+
+&sata2 {
+	status = "okay";
+};
+
 &sdhci {
 	bus-width = <8>;
 	max-frequency = <200000000>;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 07/14] arm64: dts: rockchip: add board-aliases for Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (5 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 06/14] arm64: dts: rockchip: enable sata1+2 " Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 08/14] arm64: dts: rockchip: add hdd leds to Qnap-TS433 Heiko Stuebner
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Add the aliases for the internal network interface as well as the emmc
on the board and make sure the dedicated RTC is always the first one.

The TS433 actually has two rtc devices. One coming from the rk809 pmic
without added functionality and also a dedicated RTC from Mycrocrystal
that is battery backed to keep the time.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 40af4dd0e4158..8be36250aa13d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -13,6 +13,12 @@ / {
 	model = "Qnap TS-433-4G NAS System 4-Bay";
 	compatible = "qnap,ts433", "rockchip,rk3568";
 
+	aliases {
+		ethernet0 = &gmac0;
+		mmc0 = &sdhci;
+		rtc0 = &rtc_rv8263;
+	};
+
 	chosen {
 		stdout-path = "serial2:115200n8";
 	};
@@ -120,7 +126,7 @@ pmic@20 {
 &i2c1 {
 	status = "okay";
 
-	rtc@51 {
+	rtc_rv8263: rtc@51 {
 		compatible = "microcrystal,rv8263";
 		reg = <0x51>;
 		wakeup-source;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 08/14] arm64: dts: rockchip: add hdd leds to Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (6 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 07/14] arm64: dts: rockchip: add board-aliases for Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 09/14] arm64: dts: rockchip: enable the tsadc on the Qnap-TS433 Heiko Stuebner
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Add the 4 gpio-controlled LEDs to the Qnap-TS433.

They are meant for individual disk activitivy, but I haven't found a
way for how to connect them to their individual sata slot yet.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 8be36250aa13d..abeb00add42a0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "rk3568.dtsi"
 
@@ -23,6 +24,46 @@ chosen {
 		stdout-path = "serial2:115200n8";
 	};
 
+	leds {
+		compatible = "gpio-leds";
+
+		led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_DISK;
+			gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "disk-activity";
+			pinctrl-names = "default";
+			pinctrl-0 = <&hdd1_led_pin>;
+		};
+
+		led-1 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_DISK;
+			gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "disk-activity";
+			pinctrl-names = "default";
+			pinctrl-0 = <&hdd2_led_pin>;
+		};
+
+		led-2 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_DISK;
+			gpios = <&gpio1 RK_PD7 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "disk-activity";
+			pinctrl-names = "default";
+			pinctrl-0 = <&hdd3_led_pin>;
+		};
+
+		led-3 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_DISK;
+			gpios = <&gpio2 RK_PA0 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "disk-activity";
+			pinctrl-names = "default";
+			pinctrl-0 = <&hdd4_led_pin>;
+		};
+	};
+
 	dc_12v: regulator-dc-12v {
 		compatible = "regulator-fixed";
 		regulator-name = "dc_12v";
@@ -161,6 +202,24 @@ &pcie3x2 {
 };
 
 &pinctrl {
+	leds {
+		hdd1_led_pin: hdd1-led-pin {
+			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		hdd2_led_pin: hdd2-led-pin {
+			rockchip,pins = <1 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		hdd3_led_pin: hdd3-led-pin {
+			rockchip,pins = <1 RK_PD7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		hdd4_led_pin: hdd4_led-pin {
+			rockchip,pins = <2 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	usb {
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 09/14] arm64: dts: rockchip: enable the tsadc on the Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (7 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 08/14] arm64: dts: rockchip: add hdd leds to Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 10/14] arm64: dts: rockchip: add gpio-keys to Qnap-TS433 Heiko Stuebner
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Enable the tsadc node to allow for temperature measurements of the soc.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index abeb00add42a0..34fc31ea9a39a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -246,6 +246,12 @@ &sdhci {
 	status = "okay";
 };
 
+&tsadc {
+	rockchip,hw-tshut-mode = <1>;
+	rockchip,hw-tshut-polarity = <0>;
+	status = "okay";
+};
+
 /*
  * Connected to an MCU, that provides access to more LEDs,
  * buzzer, fan control and more.
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 10/14] arm64: dts: rockchip: add gpio-keys to Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (8 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 09/14] arm64: dts: rockchip: enable the tsadc on the Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 11/14] arm64: dts: rockchip: define cpu-supply on the Qnap-TS433 Heiko Stuebner
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

The TS433 has 3 buttons, power and copy in the front as well as a reset
pinhole button on the back. The power-button is connected to the embedded
controller while the other two buttons are just gpio connected.

Add the gpio-keys definition for the two buttons we can handle right now.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 34fc31ea9a39a..9f964b6f411c9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "rk3568.dtsi"
@@ -24,6 +25,24 @@ chosen {
 		stdout-path = "serial2:115200n8";
 	};
 
+	keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&copy_button_pin>, <&reset_button_pin>;
+		pinctrl-names = "default";
+
+		key-copy {
+			label = "copy";
+			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_COPY>;
+		};
+
+		key-reset {
+			label = "reset";
+			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -202,6 +221,16 @@ &pcie3x2 {
 };
 
 &pinctrl {
+	keys {
+		copy_button_pin: copy-button-pin {
+			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		reset_button_pin: reset-button-pin {
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	leds {
 		hdd1_led_pin: hdd1-led-pin {
 			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 11/14] arm64: dts: rockchip: define cpu-supply on the Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (9 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 10/14] arm64: dts: rockchip: add gpio-keys to Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 12/14] arm64: dts: rockchip: add missing pmic information on Qnap-TS433 Heiko Stuebner
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

The TS433 seems to use a silergy,syr827 regulator for the cpu supply.
At least that is the compatible used in the vendor devicetree, though
it could very well also be another fan53555 clone.

Define the needed regulator node and hook up the cpu-supply to the
cpu cores.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 9f964b6f411c9..4bccefc0537ed 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -130,6 +130,16 @@ vcc5v0_otg: regulator-vcc5v0-otg {
 		vin-supply = <&vcc5v0_usb>;
 	};
 
+	vcc5v0_sys: regulator-vcc5v0-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&dc_12v>;
+	};
+
 	vcc5v0_usb: regulator-vcc5v0-usb {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v0_usb";
@@ -156,6 +166,22 @@ &combphy2 {
 	status = "okay";
 };
 
+&cpu0 {
+	cpu-supply = <&vdd_cpu>;
+};
+
+&cpu1 {
+	cpu-supply = <&vdd_cpu>;
+};
+
+&cpu2 {
+	cpu-supply = <&vdd_cpu>;
+};
+
+&cpu3 {
+	cpu-supply = <&vdd_cpu>;
+};
+
 &gmac0 {
 	assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
 	assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>;
@@ -175,12 +201,27 @@ &gmac0_rgmii_clk
 };
 
 &i2c0 {
+	status = "okay";
+
 	pmic@20 {
 		compatible = "rockchip,rk809";
 		reg = <0x20>;
 		interrupt-parent = <&gpio0>;
 		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 	};
+
+	vdd_cpu: regulator@40 {
+		compatible = "silergy,syr827";
+		reg = <0x40>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_cpu";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <712500>;
+		regulator-max-microvolt = <1390000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+	};
 };
 
 &i2c1 {
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 12/14] arm64: dts: rockchip: add missing pmic information on Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (10 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 11/14] arm64: dts: rockchip: define cpu-supply on the Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 13/14] arm64: dts: rockchip: enable gpu " Heiko Stuebner
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Fill in the missing pieces for RK809 pmic used on the TS433.

The regulator setup comes from the vendor-devicetree, so without proper
schematics its accuracy is somewhat unclear, but it looks really similar
to all the other rk3568 boards, so follows the reference design it seems.

The one caveat is related to vcc3v3_sd. This regulator needs to stay on.
When turned off because of no users, access to both PCIe controllers
will stall. Maybe this rail does supply the 100MHz refclk generation
or so.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 227 +++++++++++++++++-
 1 file changed, 226 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 4bccefc0537ed..b807da6e85015 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -102,6 +102,16 @@ vcc3v3_pcie: regulator-vcc3v3-pcie {
 		vin-supply = <&dc_12v>;
 	};
 
+	vcc3v3_sys: regulator-vcc3v3-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&dc_12v>;
+	};
+
 	vcc5v0_host: regulator-vcc5v0-host {
 		compatible = "regulator-fixed";
 		enable-active-high;
@@ -207,7 +217,216 @@ pmic@20 {
 		compatible = "rockchip,rk809";
 		reg = <0x20>;
 		interrupt-parent = <&gpio0>;
-		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
+		#clock-cells = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int_l>;
+		system-power-controller;
+		vcc1-supply = <&vcc3v3_sys>;
+		vcc2-supply = <&vcc3v3_sys>;
+		vcc3-supply = <&vcc3v3_sys>;
+		vcc4-supply = <&vcc3v3_sys>;
+		vcc5-supply = <&vcc3v3_sys>;
+		vcc6-supply = <&vcc3v3_sys>;
+		vcc7-supply = <&vcc3v3_sys>;
+		vcc8-supply = <&vcc3v3_sys>;
+		vcc9-supply = <&vcc3v3_sys>;
+		wakeup-source;
+
+		regulators {
+			vdd_logic: DCDC_REG1 {
+				regulator-name = "vdd_logic";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-initial-mode = <0x2>;
+				regulator-min-microvolt = <500000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_gpu: DCDC_REG2 {
+				regulator-name = "vdd_gpu";
+				regulator-always-on;
+				regulator-initial-mode = <0x2>;
+				regulator-min-microvolt = <500000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-initial-mode = <0x2>;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vdd_npu: DCDC_REG4 {
+				regulator-name = "vdd_npu";
+				regulator-initial-mode = <0x2>;
+				regulator-min-microvolt = <500000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_1v8: DCDC_REG5 {
+				regulator-name = "vcc_1v8";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdda0v9_image: LDO_REG1 {
+				regulator-name = "vdda0v9_image";
+				regulator-always-on;
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <900000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdda_0v9: LDO_REG2 {
+				regulator-name = "vdda_0v9";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <900000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdda0v9_pmu: LDO_REG3 {
+				regulator-name = "vdda0v9_pmu";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <900000>;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <900000>;
+				};
+			};
+
+			vccio_acodec: LDO_REG4 {
+				regulator-name = "vccio_acodec";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vccio_sd: LDO_REG5 {
+				regulator-name = "vccio_sd";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc3v3_pmu: LDO_REG6 {
+				regulator-name = "vcc3v3_pmu";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcca_1v8: LDO_REG7 {
+				regulator-name = "vcca_1v8";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcca1v8_pmu: LDO_REG8 {
+				regulator-name = "vcca1v8_pmu";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcca1v8_image: LDO_REG9 {
+				regulator-name = "vcca1v8_image";
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_3v3: SWITCH_REG1 {
+				regulator-name = "vcc_3v3";
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc3v3_sd: SWITCH_REG2 {
+				regulator-name = "vcc3v3_sd";
+				/*
+				 * turning this off, breaks access to both
+				 * PCIe controllers, refclk generator perhaps
+				 */
+				regulator-always-on;
+				regulator-boot-on;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+		};
 	};
 
 	vdd_cpu: regulator@40 {
@@ -290,6 +509,12 @@ hdd4_led_pin: hdd4_led-pin {
 		};
 	};
 
+	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	usb {
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 13/14] arm64: dts: rockchip: enable gpu on Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (11 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 12/14] arm64: dts: rockchip: add missing pmic information on Qnap-TS433 Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-23 19:55 ` [PATCH v3 14/14] arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433 Heiko Stuebner
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

The TS433 doesn't provide display output, but the gpu nevertheless can be
used for compute tasks for example.

So there is no reason not to enable it.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index b807da6e85015..9a0cb69c3cfa0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -210,6 +210,11 @@ &gmac0_rgmii_clk
 	status = "okay";
 };
 
+&gpu {
+	mali-supply = <&vdd_gpu>;
+	status = "okay";
+};
+
 &i2c0 {
 	status = "okay";
 
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v3 14/14] arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (12 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 13/14] arm64: dts: rockchip: enable gpu " Heiko Stuebner
@ 2024-07-23 19:55 ` Heiko Stuebner
  2024-07-25 22:20 ` [PATCH v3 00/14] Expand available features on Qnap TS433 Rob Herring (Arm)
  2024-07-30  7:32 ` Heiko Stuebner
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-23 19:55 UTC (permalink / raw)
  To: heiko; +Cc: ukleinek, linux-arm-kernel, linux-rockchip, linux-kernel

Add the two supplies for the pmu-io-domains that are defined in the
vendor devicetree for the TS433.

Tested-by: Uwe Kleine-König <ukleinek@debian.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
index 9a0cb69c3cfa0..6c4269b3d9597 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
@@ -531,6 +531,11 @@ vcc5v0_otg_en: vcc5v0-otg-en {
 	};
 };
 
+&pmu_io_domains {
+	vccio4-supply = <&vcc_1v8>;
+	vccio6-supply = <&vcc_1v8>;
+};
+
 &sata1 {
 	status = "okay";
 };
-- 
2.39.2


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH v3 00/14] Expand available features on Qnap TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (13 preceding siblings ...)
  2024-07-23 19:55 ` [PATCH v3 14/14] arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433 Heiko Stuebner
@ 2024-07-25 22:20 ` Rob Herring (Arm)
  2024-07-30  7:32 ` Heiko Stuebner
  15 siblings, 0 replies; 17+ messages in thread
From: Rob Herring (Arm) @ 2024-07-25 22:20 UTC (permalink / raw)
  To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, ukleinek, linux-kernel


On Tue, 23 Jul 2024 21:55:24 +0200, Heiko Stuebner wrote:
> Thanks to the nicely supported rk3568, the hardest part for adding things,
> is to pull things from the vendor-kernel and translating them to mainline
> standards.
> 
> This series allows the TS433 to use all 4 bays [0], wiggle some LEDs and
> access devices connected to all 3 usb ports.
> 
> The device runs stable now and might be usable for actual usage.
> 
> There is still a todo-list though:
> - the ethernet mac address for the realtek chip seems correct,
>   but the gmac0 interface currently uses a wrong one
> - i2cdetect reports devices on i2c-1 on addresses 54,55,56,57
>   model_Q0B20_Q0B30_10_10.conf from the original rescue image labels them
>     VPD_MB = I2C:0x54, VPD_BP = I2C:0x56
>   the meaning currently being unknown. Some eeprom maybe?
> - The regulator tree is slightly dubious. Everthing seems to follow rk3568
>   reference designs, but especially the regulator labeled vcc3v3_sd
>   seems to supply some PCIe functionality. So I guess the device's
>   schematics will look quite different than the regulators added to the
>   vendor devicetree.
> - Quite a bit of functionality is provided by the MCU connected to uart0.
>   According to the model.conf there should be fan-control, a number of
>   additional LEDs (status,locate,usb?)
> 
> 
> Thanks to Qnap engineers adding an easily accessible header for maskrom
> mode on the board, replacing the bootloader is also quite a breeze. A
> branch on top of today's u-boot master branch can be found on [1]. I'll
> submit that code to u-boot once I can cherry-pick the dts patches.
> 
> changes in v3:
> - fix the two regulator node-names, I noticed after sending v2
> - add Uwe's Tested-by tags
> - fold in some of Uwe's suggestions:
>   - remove some phandles
>   - more comments to explain what is connected where
>   - handle the two RTCs in the system, though not by hacking around
>     to disable the pmic-one, instead just make sure the real one
>     stays the first rtc
> changes in v2:
> - add patches for tsadc, gpio-keys, cpu-supply, pmic, gpu and io-domains
> 
> 
> [0] I only have two drives right now, but I tested both the internal
> sata connector as well as the PCIe connected sata controller in different
> combinations.
> [1] https://github.com/mmind/u-boot-rockchip/tree/dev/qnap-ts433/v2024.07
> 
> Heiko Stuebner (14):
>   arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433
>   arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433
>   arm64: dts: rockchip: enable uart0 on Qnap-TS433
>   arm64: dts: rockchip: enable usb ports on Qnap-TS433
>   arm64: dts: rockchip: add stdout path on Qnap-TS433
>   arm64: dts: rockchip: enable sata1+2 on Qnap-TS433
>   arm64: dts: rockchip: add board-aliases for Qnap-TS433
>   arm64: dts: rockchip: add hdd leds to Qnap-TS433
>   arm64: dts: rockchip: enable the tsadc on the Qnap-TS433
>   arm64: dts: rockchip: add gpio-keys to Qnap-TS433
>   arm64: dts: rockchip: define cpu-supply on the Qnap-TS433
>   arm64: dts: rockchip: add missing pmic information on Qnap-TS433
>   arm64: dts: rockchip: enable gpu on Qnap-TS433
>   arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433
> 
>  .../boot/dts/rockchip/rk3568-qnap-ts433.dts   | 546 +++++++++++++++++-
>  1 file changed, 543 insertions(+), 3 deletions(-)
> 
> --
> 2.39.2
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


New warnings running 'make CHECK_DTBS=y rockchip/rk3568-qnap-ts433.dtb' for 20240723195538.1133436-1-heiko@sntech.de:

arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dtb: sata@fc400000: Unevaluated properties are not allowed ('power-domains' was unexpected)
	from schema $id: http://devicetree.org/schemas/ata/rockchip,dwc-ahci.yaml#
arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dtb: sata@fc800000: Unevaluated properties are not allowed ('power-domains' was unexpected)
	from schema $id: http://devicetree.org/schemas/ata/rockchip,dwc-ahci.yaml#






^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH v3 00/14] Expand available features on Qnap TS433
  2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
                   ` (14 preceding siblings ...)
  2024-07-25 22:20 ` [PATCH v3 00/14] Expand available features on Qnap TS433 Rob Herring (Arm)
@ 2024-07-30  7:32 ` Heiko Stuebner
  15 siblings, 0 replies; 17+ messages in thread
From: Heiko Stuebner @ 2024-07-30  7:32 UTC (permalink / raw)
  To: Heiko Stuebner; +Cc: linux-kernel, ukleinek, linux-rockchip, linux-arm-kernel

On Tue, 23 Jul 2024 21:55:24 +0200, Heiko Stuebner wrote:
> Thanks to the nicely supported rk3568, the hardest part for adding things,
> is to pull things from the vendor-kernel and translating them to mainline
> standards.
> 
> This series allows the TS433 to use all 4 bays [0], wiggle some LEDs and
> access devices connected to all 3 usb ports.
> 
> [...]

Applied, thanks!

[01/14] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433
        commit: e0ec6d48226fb3d4df18895b56f0b7a94c0fe474
[02/14] arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433
        commit: 0f5f87a1d602a33028522784eb005647fa1b5c11
[03/14] arm64: dts: rockchip: enable uart0 on Qnap-TS433
        commit: 07ef8be476bebd77cba3ca4804be03cc0dba414f
[04/14] arm64: dts: rockchip: enable usb ports on Qnap-TS433
        commit: d992203f57c5caad0dbd4a9c669d79b315873c81
[05/14] arm64: dts: rockchip: add stdout path on Qnap-TS433
        commit: e1cb5d8a92e41171bf4d5ddc459bd96372500901
[06/14] arm64: dts: rockchip: enable sata1+2 on Qnap-TS433
        commit: 673c1353b3d476b9c5df6b84a777ed171e5594f5
[07/14] arm64: dts: rockchip: add board-aliases for Qnap-TS433
        commit: dadd4256e12360d3ff1f6481b2e4697f9d890caf
[08/14] arm64: dts: rockchip: add hdd leds to Qnap-TS433
        commit: ea91aabf18bcad6f5eceae6848ea6570ea61f126
[09/14] arm64: dts: rockchip: enable the tsadc on the Qnap-TS433
        commit: 2dfdddd9d20306fd0d04b88fcbbf36d76fb67f11
[10/14] arm64: dts: rockchip: add gpio-keys to Qnap-TS433
        commit: 9b682d31b24f1f70b5b4d0618095d46e0722b9d8
[11/14] arm64: dts: rockchip: define cpu-supply on the Qnap-TS433
        commit: 99b36ba910d896bddbb9a190ca686c6d9cd0325f
[12/14] arm64: dts: rockchip: add missing pmic information on Qnap-TS433
        commit: ee078c7daa98353496410b715a5acbb41d7d3a90
[13/14] arm64: dts: rockchip: enable gpu on Qnap-TS433
        commit: 9130eb62586f4cef0557d0378fb7e78d7397ab2d
[14/14] arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433
        commit: 64b7f16fb3947e5d08d9e9b860ce966250e45d52

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2024-07-30  7:33 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-23 19:55 [PATCH v3 00/14] Expand available features on Qnap TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 01/14] arm64: dts: rockchip: add PCIe supply regulator to Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 02/14] arm64: dts: rockchip: enable second PCIe controller on the Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 03/14] arm64: dts: rockchip: enable uart0 on Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 04/14] arm64: dts: rockchip: enable usb ports " Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 05/14] arm64: dts: rockchip: add stdout path " Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 06/14] arm64: dts: rockchip: enable sata1+2 " Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 07/14] arm64: dts: rockchip: add board-aliases for Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 08/14] arm64: dts: rockchip: add hdd leds to Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 09/14] arm64: dts: rockchip: enable the tsadc on the Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 10/14] arm64: dts: rockchip: add gpio-keys to Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 11/14] arm64: dts: rockchip: define cpu-supply on the Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 12/14] arm64: dts: rockchip: add missing pmic information on Qnap-TS433 Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 13/14] arm64: dts: rockchip: enable gpu " Heiko Stuebner
2024-07-23 19:55 ` [PATCH v3 14/14] arm64: dts: rockchip: add 2 pmu_io_domain supplies for Qnap-TS433 Heiko Stuebner
2024-07-25 22:20 ` [PATCH v3 00/14] Expand available features on Qnap TS433 Rob Herring (Arm)
2024-07-30  7:32 ` Heiko Stuebner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®