Skip to contentSkip to conversation

thermal: sun8i: fix r40 ths number

PATCH In review Yangtao Li 5 participants 9 messages Jan 6, 2020 – Jan 27, 2020

Subsystems (4)
lore
Share & tools
lore

Yangtao Li

author maintainer
#0 lore raw

PATCH v2 1/2 thermal: sun8i: fix r40 ths number

According to the spec, r40 has 2 thermal sensors.
Sensor0 located in the CPU, another in the GPU.

Fixes 730a45ccd9322 ("thermal/drivers/sun8i: Add thermal driver for H6/H5/H3/A64/A83T/R40")

Tested-on: sun8i-r40-bananapi-m2-ultra

---
 drivers/thermal/sun8i_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/sun8i_thermal.c +1 -1
index 23a5f4aa4be4..c5661d7c3e20 100644
@@ -565,7 +565,7 @@ static const struct ths_thermal_chip sun8i_h3_ths = {
 };
 
 static const struct ths_thermal_chip sun8i_r40_ths = {
-	.sensor_num = 3,
+	.sensor_num = 2,
 	.offset = 251086,
 	.scale = 1130,
 	.has_mod_clk = true,
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH v2 2/2 ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

---
 arch/arm/boot/dts/sun8i-r40.dtsi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm/boot/dts/sun8i-r40.dtsi +28 -0
index 421dfbbfd7ee..8ccda5cb873f 100644
@@ -46,6 +46,7 @@
 #include <dt-bindings/clock/sun8i-r40-ccu.h>
 #include <dt-bindings/reset/sun8i-r40-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
 	#address-cells = <1>;
@@ -109,6 +110,22 @@
 		status = "disabled";
 	};
 
+	thermal-zones {
+		cpu_thermal: cpu0-thermal {
+			/* milliseconds */
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 0>;
+		};
+
+		gpu_thermal: gpu-thermal {
+			/* milliseconds */
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 1>;
+		};
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -421,6 +438,17 @@
 			clocks = <&osc24M>;
 		};
 
+		ths: thermal-sensor@1c24c00 {
+			compatible = "allwinner,sun8i-r40-ths";
+			reg = <0x01c24c00 0x100>;
+			clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>;
+			clock-names = "bus", "mod";
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+			resets = <&ccu RST_BUS_THS>;
+			/* TODO: add nvmem-cells for calibration */
+			#thermal-sensor-cells = <1>;
+		};
+
 		uart0: serial@1c28000 {
 			compatible = "snps,dw-apb-uart";
 			reg = <0x01c28000 0x400>;
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

Quoted 5 lines · Yangtao Li

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

As far as I know, tested-on is not documented anywhere (and isn't really used either). I've removed it and applied, thanks!

Maxime

#3 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Yangtao Li

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

As far as I know, tested-on is not documented anywhere (and isn't really used either). I've removed it and applied, thanks!

I normally add it as a comment following the Tested-by. Makes it easier to track who tested what when patches touch multiple boards.

ChenYu

#4 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

In reply to Maxime Ripard
Quoted 9 lines · Maxime Ripard
Quoted 5 lines · Yangtao Li

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

As far as I know, tested-on is not documented anywhere (and isn't really used either). I've removed it and applied, thanks!

I think this patch should go through my tree as it refers to a commit in my branch.

Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#5 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

Hi Daniel,

Quoted 8 lines · Daniel Lezcano
Quoted 7 lines · Maxime Ripard
Quoted 5 lines · Yangtao Li

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

Quoted 5 lines
Quoted 2 lines

As far as I know, tested-on is not documented anywhere (and isn't really used either). I've removed it and applied, thanks!

I think this patch should go through my tree as it refers to a commit in my branch.

I'm not quite sure to get why. Even though that patch depends on the one affecting the driver to be functional, it doesn't break anything when merged through arm-soc, and similarly yours doesn't affect any other tree if it's merged through your tree, so there's no dependency?

Maxime

#6 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

Quoted 14 lines · Maxime Ripard

Hi Daniel,

Quoted 11 lines · Daniel Lezcano
Quoted 9 lines · Maxime Ripard
Quoted 5 lines · Yangtao Li

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

As far as I know, tested-on is not documented anywhere (and isn't really used either). I've removed it and applied, thanks!

Quoted 7 lines
Quoted 2 lines

I think this patch should go through my tree as it refers to a commit in my branch.

I'm not quite sure to get why. Even though that patch depends on the one affecting the driver to be functional, it doesn't break anything when merged through arm-soc, and similarly yours doesn't affect any other tree if it's merged through your tree, so there's no dependency?

Sorry, I puzzled myself, I thought you meant you applied patch 1/2

Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author maintainer
#7 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

HI Chen-Yu and Maxime,

Can you pick this up again?

Yangtao

Quoted 34 lines · Daniel Lezcano
Quoted 14 lines · Maxime Ripard

Hi Daniel,

Quoted 11 lines · Daniel Lezcano
Quoted 9 lines · Maxime Ripard
Quoted 5 lines · Yangtao Li

There are two sensors, sensor0 for CPU, sensor1 for GPU.

Tested-on: sun8i-r40-bananapi-m2-ultra

As far as I know, tested-on is not documented anywhere (and isn't really used either). I've removed it and applied, thanks!

Quoted 7 lines
Quoted 2 lines

I think this patch should go through my tree as it refers to a commit in my branch.

I'm not quite sure to get why. Even though that patch depends on the one affecting the driver to be functional, it doesn't break anything when merged through arm-soc, and similarly yours doesn't affect any other tree if it's merged through your tree, so there's no dependency?

Sorry, I puzzled myself, I thought you meant you applied patch 1/2

--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

#8 lore raw

Re: [PATCH v2 2/2] ARM: dts: sun8i-r40: Add thermal sensor and thermal zones

Hi,

Quoted 3 lines · Frank Lee

HI Chen-Yu and Maxime,

Can you pick this up again?

Sorry, I'm not quite sure what happened to this patch... I've picked it up for 5.7 (for real this time, hopefully).

Maxime