enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip64-6.19: update rk3588 NPU patches; remove always-on from NPU regulator

Browse Source 
- I've submitted upstream, and got feedback ref the always-on.
- See https://lore.kernel.org/linux-rockchip/20260101-arm64-dts-rockchip-rk3588-npu-enablements-v2-0-013cf5d5c39d@pardini.net
- update: merged to linux-rockchip for-next, should land in 6.20/7.0
This commit is contained in:
Ricardo Pardini 2026-01-01 08:26:15 +01:00
parent a086111128
commit 2b9699c601
3 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patch/kernel/archive/rockchip64-6.19/rk3588-1200-arm64-dts-rockchip-Enable-the-NPU-on-NanoPC-T6-LTS.patch
View File

@ -1,21 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 20 Oct 2025 21:25:02 +0200
Subject: arm64: dts: rockchip: Enable the NPU on NanoPC T6(-LTS)
Date: Thu, 1 Jan 2026 07:43:09 +0100
Subject: arm64: dts: rockchip: Enable the NPU on NanoPC T6/T6-LTS
Enable the NPU on FriendlyElec NanoPC T6/T6-LTS boards;
vdd_npu_s0 was already in place.
Enable the NPU on FriendlyElec NanoPC T6/T6-LTS boards.
The regulator vdd_npu_s0 was already in place; since
the NPU power domain supply is now described, remove the
regulator's always-on.
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 35 ++++++++++
1 file changed, 35 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 36 +++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
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
@@ -665,6 +665,10 @@ &pd_gpu {
@@ -466,7 +466,6 @@ vdd_npu_s0: regulator@42 {
reg = <0x42>;
fcs,suspend-voltage-selector = <1>;
regulator-name = "vdd_npu_s0";
- regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
@@ -665,6 +664,10 @@ &pd_gpu {
domain-supply = <&vdd_gpu_s0>;
};
@ -26,7 +36,7 @@ index 111111111111..222222222222 100644
&pinctrl {
gpio-leds {
sys_led_pin: sys-led-pin {
@@ -742,6 +746,37 @@ &pwm1 {
@@ -742,6 +745,37 @@ &pwm1 {
status = "okay";
};

26
patch/kernel/archive/rockchip64-6.19/rk3588-1201-arm64-dts-rockchip-Enable-the-NPU-on-CM3588.patch
View File

@ -1,21 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 20 Oct 2025 21:29:13 +0200
Subject: arm64: dts: rockchip: Enable the NPU on CM3588
Date: Thu, 1 Jan 2026 07:43:10 +0100
Subject: arm64: dts: rockchip: Enable the NPU on FriendlyElec CM3588
Enable the NPU on FriendlyElec CM3588;
vdd_npu_s0 was already in place.
Enable the NPU on FriendlyElec CM3588.
The regulator vdd_npu_s0 was already in place; since
the NPU power domain supply is now described, remove the
regulator's always-on.
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
---
arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi | 34 ++++++++++
1 file changed, 34 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi | 35 +++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi
@@ -264,6 +264,10 @@ &pd_gpu {
@@ -182,7 +182,6 @@ vdd_npu_s0: regulator@42 {
reg = <0x42>;
fcs,suspend-voltage-selector = <1>;
regulator-name = "vdd_npu_s0";
- regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
@@ -264,6 +263,10 @@ &pd_gpu {
domain-supply = <&vdd_gpu_s0>;
};
@ -26,7 +36,7 @@ index 111111111111..222222222222 100644
&pinctrl {
gpio-leds {
led_sys_pin: led-sys-pin {
@@ -294,6 +298,36 @@ sd_s0_pwr: sd-s0-pwr {
@@ -294,6 +297,36 @@ sd_s0_pwr: sd-s0-pwr {
};
};

22
patch/kernel/archive/rockchip64-6.19/rk3588-1202-arm64-dts-rockchip-Enable-the-NPU-on-Turing-RK1.patch
View File

@ -1,21 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Thu, 4 Dec 2025 18:02:02 +0100
Date: Thu, 1 Jan 2026 07:43:11 +0100
Subject: arm64: dts: rockchip: Enable the NPU on Turing RK1
Enable the NPU on Turing RK1.
Regulator vdd_npu_s0 was already in place.
The regulator vdd_npu_s0 was already in place; since
the NPU power domain supply is now described, remove the
regulator's always-on.
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
---
arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 34 ++++++++++
1 file changed, 34 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 35 +++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
@@ -324,6 +324,10 @@ &pd_gpu {
@@ -171,7 +171,6 @@ vdd_npu_s0: regulator@42 {
reg = <0x42>;
fcs,suspend-voltage-selector = <1>;
regulator-name = "vdd_npu_s0";
- regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
@@ -324,6 +323,10 @@ &pd_gpu {
domain-supply = <&vdd_gpu_s0>;
};
@ -26,7 +36,7 @@ index 111111111111..222222222222 100644
&pinctrl {
fan {
fan_int: fan-int {
@@ -364,6 +368,36 @@ &pwm0 {
@@ -364,6 +367,36 @@ &pwm0 {
status = "okay";
};