try fix h616 thermal sensors

chraac · Sep 8, 2024 · 6cecb04 · 6cecb04
1 parent 265a3f0
commit 6cecb04
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 5,854 deletions.
diff --git a/...dd-thermal-sensor-and-thermal-zones.patch → ...dd-thermal-sensor-and-thermal-zones.patch b/...dd-thermal-sensor-and-thermal-zones.patch → ...dd-thermal-sensor-and-thermal-zones.patch
@@ -11,42 +11,42 @@ Signed-off-by: Kali Prasad <kprasadvnsi@protonmail.com>
  1 file changed, 23 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-index 921d5f61d8d6..35ec95ed63f6 100644
+index 747964647578..1bf71a0a0202 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-@@ -26,6 +26,7 @@ cpu0: cpu@0 {
+@@ -29,6 +29,7 @@ cpu0: cpu@0 {
  			reg = <0>;
  			enable-method = "psci";
  			clocks = <&ccu CLK_CPUX>;
 +			clock-latency-ns = <244144>; /* 8 32k periods */
  			#cooling-cells = <2>;
  		};
 
-@@ -35,6 +36,7 @@ cpu1: cpu@1 {
+@@ -38,6 +39,7 @@ cpu1: cpu@1 {
  			reg = <1>;
  			enable-method = "psci";
  			clocks = <&ccu CLK_CPUX>;
 +			clock-latency-ns = <244144>; /* 8 32k periods */
  			#cooling-cells = <2>;
  		};
 
-@@ -44,6 +46,7 @@ cpu2: cpu@2 {
+@@ -47,6 +49,7 @@ cpu2: cpu@2 {
  			reg = <2>;
  			enable-method = "psci";
  			clocks = <&ccu CLK_CPUX>;
 +			clock-latency-ns = <244144>; /* 8 32k periods */
  			#cooling-cells = <2>;
  		};
 
-@@ -53,6 +56,7 @@ cpu3: cpu@3 {
+@@ -56,6 +59,7 @@ cpu3: cpu@3 {
  			reg = <3>;
  			enable-method = "psci";
  			clocks = <&ccu CLK_CPUX>;
 +			clock-latency-ns = <244144>; /* 8 32k periods */
  			#cooling-cells = <2>;
  		};
  	};
-@@ -864,24 +868,37 @@ cpu-thermal {
+@@ -1209,24 +1213,37 @@ cpu-thermal {
  			polling-delay = <1000>;
  			thermal-sensors = <&ths 2>;
  			sustainable-power = <1000>;
@@ -87,7 +87,7 @@ index 921d5f61d8d6..35ec95ed63f6 100644
  		};
 
  		gpu-thermal {
-@@ -891,7 +908,7 @@ gpu-thermal {
+@@ -1236,7 +1253,7 @@ gpu-thermal {
  			sustainable-power = <1100>;
 
  			trips {
@@ -96,7 +96,7 @@ index 921d5f61d8d6..35ec95ed63f6 100644
  					temperature = <110000>;
  					type = "critical";
  					hysteresis = <0>;
-@@ -905,7 +922,7 @@ ve-thermal {
+@@ -1250,7 +1267,7 @@ ve-thermal {
  			thermal-sensors = <&ths 1>;
 
  			trips {
@@ -105,7 +105,7 @@ index 921d5f61d8d6..35ec95ed63f6 100644
  					temperature = <110000>;
  					type = "critical";
  					hysteresis = <0>;
-@@ -919,7 +936,7 @@ ddr-thermal {
+@@ -1264,7 +1281,7 @@ ddr-thermal {
  			thermal-sensors = <&ths 3>;
 
  			trips {

diff --git a/...-thermal-sun8i_thermal-Add-for-H616.patch → ...-thermal-sun8i_thermal-Add-for-H616.patch b/...-thermal-sun8i_thermal-Add-for-H616.patch → ...-thermal-sun8i_thermal-Add-for-H616.patch
@@ -8,11 +8,11 @@ two additional temperature sensors for VE and DDR.
 
 Signed-off-by: Kali Prasad <kprasadvnsi@protonmail.com>
 ---
- drivers/thermal/sun8i_thermal.c | 94 +++++++++++++++++++++++++++++++--
- 1 file changed, 91 insertions(+), 3 deletions(-)
+ drivers/thermal/sun8i_thermal.c | 99 +++++++++++++++++++++++++++++++--
+ 1 file changed, 93 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
-index c6a82ef84aca..c1dc688eb449 100644
+index c6a82ef84aca..362a4e7fa517 100644
 --- a/drivers/thermal/sun8i_thermal.c
 +++ b/drivers/thermal/sun8i_thermal.c
 @@ -112,6 +112,12 @@ static int sun50i_h5_calc_temp(struct ths_device *tmdev,
@@ -124,9 +124,16 @@ index c6a82ef84aca..c1dc688eb449 100644
 
  static int sun8i_ths_register(struct ths_device *tmdev)
  {
-@@ -720,10 +808,10 @@ static const struct ths_thermal_chip sun50i_h616_ths = {
- 	.offset = 263655,
- 	.scale = 810,
+@@ -715,15 +803,14 @@ static const struct ths_thermal_chip sun20i_d1_ths = {
+ static const struct ths_thermal_chip sun50i_h616_ths = {
+ 	.sensor_num = 4,
+ 	.has_bus_clk_reset = true,
+-	.needs_sram = true,
+ 	.ft_deviation = 8000,
+-	.offset = 263655,
+-	.scale = 810,
++	.offset = -3255,
++	.scale = -81,
  	.temp_data_base = SUN50I_H6_THS_TEMP_DATA,
 -	.calibrate = sun50i_h6_ths_calibrate,
 -	.init = sun50i_h6_thermal_init,