Merge pull request #113 from CodeChenL/main

linux: stable: remove DPC attribute from meson-g12 gpu node
radxa-repo · Sep 29, 2024 · 9095687 · 9095687
2 parents bc1da78 + d04dc0f
commit 9095687
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/linux/.stable-6.1/0020-radxa-zero/0011-Add-dummy-DPC-to-make-power_allocator-happy.patch b/linux/.stable-6.1/0020-radxa-zero/0011-Add-dummy-DPC-to-make-power_allocator-happy.patch
@@ -112,3 +112,23 @@ index 67aef71a1400..ecf5beaa4547 100644
 -- 
 2.41.0
 
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index c80d24fc6..bf267d35b 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -2505,6 +2505,7 @@ cpu_thermal: cpu-thermal {
+ 			polling-delay = <1000>;
+ 			polling-delay-passive = <100>;
+ 			thermal-sensors = <&cpu_temp>;
++			sustainable-power = <3000>; /* 3000mW */
+
+ 			trips {
+ 				cpu_passive: cpu-passive {
+@@ -2531,6 +2532,7 @@ ddr_thermal: ddr-thermal {
+ 			polling-delay = <1000>;
+ 			polling-delay-passive = <100>;
+ 			thermal-sensors = <&ddr_temp>;
++			sustainable-power = <2000>; /* 2000mW */
+
+ 			trips {
+ 				ddr_passive: ddr-passive {