JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

board: nanopct6: split and refactor patches for rockchip-6.12 (#8550)

Browse Source
This commit is contained in:
SuperKali
2025-08-27 08:49:09 +02:00
committed by GitHub
parent 034e1e45cd
commit 64b0c6e2af
4 changed files with 153 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
patch/kernel/archive/rockchip64-6.12/rk3588-1051-board-nanopc-t6-Add-FAN-support.patch Normal file
View File

@@ -0,0 +1,68 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Wed, 27 Aug 2025 06:03:12 +0000
Subject: Adding FAN support for NanoPC T6 & LTS
Signed-off-by: SuperKali <hello@superkali.me>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 37 ++++++++++
1 file changed, 37 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -66,6 +66,15 @@ usr_led: led-1 {
};
};
+ fan0: pwm-fan {
+ compatible = "pwm-fan";
+ #cooling-cells = <2>;
+ cooling-levels = <100 160 190 200 215 235 255>;
+ pwms = <&pwm1 0 50000 0>;
+ fan-supply = <&vcc5v0_sys>;
+ };
+
+
sound {
compatible = "simple-audio-card";
pinctrl-names = "default";
@@ -485,6 +494,34 @@ i2s0_8ch_p0_0: endpoint {
};
};
+&package_thermal {
+ polling-delay = <1000>;
+
+ trips {
+ package_fan0: package-fan0 {
+ temperature = <55000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+ package_fan1: package-fan1 {
+ temperature = <65000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+ };
+
+ cooling-maps {
+ map1 {
+ trip = <&package_fan0>;
+ cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
+ };
+ map2 {
+ trip = <&package_fan1>;
+ cooling-device = <&fan0 2 THERMAL_NO_LIMIT>;
+ };
+ };
+};
+
&pcie2x1l0 {
reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc_3v3_pcie20>;
--
Armbian

126
patch/kernel/archive/rockchip64-6.12/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch
View File

@@ -1,126 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Mon, 21 Oct 2024 13:21:03 +0000
Subject: Add Missing parameters for USB3.0 and FAN
Signed-off-by: SuperKali <hello@superkali.me>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts | 4 -
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 58 ++++++++++
2 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
@@ -42,10 +42,6 @@ &u2phy1 {
status = "okay";
};
-&u2phy1_otg {
- status = "okay";
-};
-
&u2phy2_host {
phy-supply = <&vcc5v0_usb20_host>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -66,6 +66,15 @@ usr_led: led-1 {
};
};
+ /* FAN */
+ fan0: pwm-fan {
+ compatible = "pwm-fan";
+ #cooling-cells = <2>;
+ cooling-levels = <100 160 190 200 215 235 255>;
+ pwms = <&pwm1 0 50000 0>;
+ fan-supply = <&vcc5v0_sys>;
+ };
+
sound {
compatible = "simple-audio-card";
pinctrl-names = "default";
@@ -171,6 +180,18 @@ vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
vin-supply = <&vcc5v0_sys>;
};
+ vcc5v0_host_30: vcc5v0-host-30 {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc5v0_host30_en>;
+ regulator-name = "vcc5v0_host_30";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc5v0_sys>;
+ };
+
vcc3v3_pcie30: vcc3v3-pcie30-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -485,6 +506,34 @@ i2s0_8ch_p0_0: endpoint {
};
};
+&package_thermal {
+ polling-delay = <1000>;
+
+ trips {
+ package_fan0: package-fan0 {
+ temperature = <55000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+ package_fan1: package-fan1 {
+ temperature = <65000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+ };
+
+ cooling-maps {
+ map1 {
+ trip = <&package_fan0>;
+ cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
+ };
+ map2 {
+ trip = <&package_fan1>;
+ cooling-device = <&fan0 2 THERMAL_NO_LIMIT>;
+ };
+ };
+};
+
&pcie2x1l0 {
reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc_3v3_pcie20>;
@@ -575,6 +624,10 @@ typec5v_pwren: typec5v-pwren {
rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
+ vcc5v0_host30_en: vcc5v0-host30-en {
+ rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
usbc0_int: usbc0-int {
rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
};
@@ -973,6 +1026,11 @@ &u2phy0_otg {
status = "okay";
};
+&u2phy1_otg {
+ phy-supply = <&vcc5v0_host_30>;
+ status = "okay";
+};
+
&u2phy2_host {
status = "okay";
};
--
Armbian

6
patch/kernel/archive/rockchip64-6.12/rk3588-1052-board-nanopc-t6-Add-HDMI-support.patch
View File

@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
#include "rk3588.dtsi" #include "rk3588.dtsi"
/ { / {
@@ -259,6 +260,11 @@ &cpu_b3 { @@ -247,6 +248,11 @@ &cpu_b3 {
cpu-supply = <&vdd_cpu_big1_s0>; cpu-supply = <&vdd_cpu_big1_s0>;
}; };
@@ -32,7 +32,7 @@ index 111111111111..222222222222 100644
&gpio0 { &gpio0 {
gpio-line-names = /* GPIO0 A0-A7 */ gpio-line-names = /* GPIO0 A0-A7 */
"", "", "", "", "", "", "", "",
@@ -339,6 +345,21 @@ &gpu { @@ -327,6 +333,21 @@ &gpu {
status = "okay"; status = "okay";
}; };
@@ -54,7 +54,7 @@ index 111111111111..222222222222 100644
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0m2_xfer>; pinctrl-0 = <&i2c0m2_xfer>;
@@ -1097,3 +1118,18 @@ &usb_host1_ehci { @@ -1076,3 +1097,18 @@ &usb_host1_ehci {
&usb_host1_ohci { &usb_host1_ohci {
status = "okay"; status = "okay";
}; };

82
patch/kernel/archive/rockchip64-6.12/rk3588-1053-board-nanopc-t6-fix-usb3-a.patch Normal file
View File

@@ -0,0 +1,82 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Wed, 27 Aug 2025 06:16:58 +0000
Subject: Fixing USB-A 3.0 on NanoPC T6
Signed-off-by: SuperKali <hello@superkali.me>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts | 5 --
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 23 ++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
@@ -53,8 +53,3 @@ &u2phy2_host {
&usbdp_phy1 {
status = "okay";
};
-
-&usb_host1_xhci {
- dr_mode = "host";
- status = "okay";
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -169,6 +169,18 @@ vbus5v0_typec: vbus5v0-typec-regulator {
vin-supply = <&vcc5v0_sys>;
};
+ vcc5v0_host_30: vcc5v0-host-30 {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc5v0_host30_en>;
+ regulator-name = "vcc5v0_host_30";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc5v0_sys>;
+ };
+
vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -636,6 +648,10 @@ typec5v_pwren: typec5v-pwren {
usbc0_int: usbc0-int {
rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
};
+
+ vcc5v0_host30_en: vcc5v0-host30-en {
+ rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
};
};
@@ -1028,6 +1044,7 @@ &u2phy0 {
};
&u2phy0_otg {
+ phy-supply = <&vbus5v0_usb>;
status = "okay";
};
@@ -1090,6 +1107,12 @@ usb_host0_xhci_drd_sw: endpoint {
};
};
+&usb_host1_xhci {
+ dr_mode = "host";
+ extcon = <&u2phy0>;
+ status = "okay";
+};
+
&usb_host1_ehci {
status = "okay";
};
--
Armbian