Skip to contentSkip to conversation

ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi

PATCH Applied Johan Jonker 3 participants 6 messages Jan 17, 2021 – Jan 18, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi

A test with the command below gives for example this error:
/arch/arm/boot/dts/rk3288-tinker.dt.yaml:
thermal-zones: 'cpu_thermal', 'gpu_thermal', 'reserve_thermal' do not match any of the regexes:
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Rename Rockchip rk3288 thermal subnodes
so that it ends with "-thermal"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ thermal/thermal-zones.yaml

---
 arch/arm/boot/dts/rk3288.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +3 -3
index 01ea1f170..29ffe2eb9 100644
@@ -488,14 +488,14 @@
 	};
 
 	thermal-zones {
-		reserve_thermal: reserve_thermal {
+		reserve_thermal: reserve-thermal {
 			polling-delay-passive = <1000>; /* milliseconds */
 			polling-delay = <5000>; /* milliseconds */
 
 			thermal-sensors = <&tsadc 0>;
 		};
 
-		cpu_thermal: cpu_thermal {
+		cpu_thermal: cpu-thermal {
 			polling-delay-passive = <100>; /* milliseconds */
 			polling-delay = <5000>; /* milliseconds */
 
@@ -539,7 +539,7 @@
 			};
 		};
 
-		gpu_thermal: gpu_thermal {
+		gpu_thermal: gpu-thermal {
 			polling-delay-passive = <100>; /* milliseconds */
 			polling-delay = <5000>; /* milliseconds */
 
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 2/3 arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi

A test with the command below gives for example this error:
/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dt.yaml:
thermal-zones: 'cpu', 'gpu' do not match any of the regexes:
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Make the rk3368 thermal subnode names in line with the rest of the Rockchip dts files. Add a label and rename them so that it ends with "-thermal"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ thermal/thermal-zones.yaml

---
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3368.dtsi +2 -2
index dad1a00e6..cd8274a35 100644
@@ -400,7 +400,7 @@
 	};
 
 	thermal-zones {
-		cpu {
+		cpu_thermal: cpu-thermal {
 			polling-delay-passive = <100>; /* milliseconds */
 			polling-delay = <5000>; /* milliseconds */
 
@@ -444,7 +444,7 @@
 			};
 		};
 
-		gpu {
+		gpu_thermal: gpu-thermal {
 			polling-delay-passive = <100>; /* milliseconds */
 			polling-delay = <5000>; /* milliseconds */
 
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#2 lore raw

PATCH 3/3 arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi

In reply to Johan Jonker

A test with the command below gives for example this error:
/arch/arm64/boot/dts/rockchip/rk3399-evb.dt.yaml:
thermal-zones: 'cpu', 'gpu' do not match any of the regexes:
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Rename Rockchip rk3399 thermal subnodes so that it ends with "-thermal"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ thermal/thermal-zones.yaml

---
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +1 -1
index c88295782..b20774081 100644
@@ -126,7 +126,7 @@
 };
 
 &thermal_zones {
-	cpu_thermal: cpu {
+	cpu_thermal: cpu-thermal {
 		polling-delay-passive = <100>;
 		polling-delay = <1000>;
 		thermal-sensors = <&tsadc 0>;
arch/arm64/boot/dts/rockchip/rk3399.dtsi +2 -2
index 4e94b7ebd..3de493ad6 100644
@@ -761,7 +761,7 @@
 	};
 
 	thermal_zones: thermal-zones {
-		cpu_thermal: cpu {
+		cpu_thermal: cpu-thermal {
 			polling-delay-passive = <100>;
 			polling-delay = <1000>;
 
@@ -805,7 +805,7 @@
 			};
 		};
 
-		gpu_thermal: gpu {
+		gpu_thermal: gpu-thermal {
 			polling-delay-passive = <100>;
 			polling-delay = <1000>;
 
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#3 lore raw

Re: [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi

Quoted 23 lines · Johan Jonker

A test with the command below gives for example this error:
/arch/arm64/boot/dts/rockchip/rk3399-evb.dt.yaml:
thermal-zones: 'cpu', 'gpu' do not match any of the regexes:
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Rename Rockchip rk3399 thermal subnodes so that it ends with "-thermal"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ thermal/thermal-zones.yaml

---
  arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +-
  arch/arm64/boot/dts/rockchip/rk3399.dtsi        | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +0 -0
index c88295782..b20774081 100644

arch/arm64/boot/dts/rockchip/rk3399-rock960.dts line 132

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +1 -1
@@ -126,7 +126,7 @@
  };
 
  &thermal_zones {
-	cpu_thermal: cpu {
+	cpu_thermal: cpu-thermal {
  		polling-delay-passive = <100>;
  		polling-delay = <1000>;
  		thermal-sensors = <&tsadc 0>;

Passing observation: why is this DT not just referencing &cpu_thermal directly to add the board-specific parts (and not repeat all the SoC default properties) anyway? Cleaning the whole thing up might have been a good idea :/

Robin.

Quoted 15 lines
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
index 4e94b7ebd..3de493ad6 100644
@@ -761,7 +761,7 @@
  	};
 
  	thermal_zones: thermal-zones {
-		cpu_thermal: cpu {
+		cpu_thermal: cpu-thermal {
  			polling-delay-passive = <100>;
  			polling-delay = <1000>;
 

arch/arm64/boot/dts/rockchip/rk3399.dtsi line 811

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -805,7 +805,7 @@
  			};
  		};
 
-		gpu_thermal: gpu {
+		gpu_thermal: gpu-thermal {
  			polling-delay-passive = <100>;
  			polling-delay = <1000>;
 

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer Applied
#4 lore raw

Re: (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi

In reply to Johan Jonker
Quoted 10 lines · Johan Jonker

A test with the command below gives for example this error:
/arch/arm/boot/dts/rk3288-tinker.dt.yaml:
thermal-zones: 'cpu_thermal', 'gpu_thermal', 'reserve_thermal' do not match any of the regexes:
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Rename Rockchip rk3288 thermal subnodes
so that it ends with "-thermal"

[...]

Applied, thanks!

[2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi

      commit: 7c96a5cf680ac7339999becd454e1f2fd9b258fb
[3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi
      commit: e58061b59787270a57839397e50bb4400b9e2de9

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer
#5 lore raw

Re: (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi

Am Montag, 18. Januar 2021, 13:57:33 CET schrieb Heiko Stuebner:

Quoted 10 lines · Johan Jonker
Quoted 9 lines

A test with the command below gives for example this error:
/arch/arm/boot/dts/rk3288-tinker.dt.yaml:
thermal-zones: 'cpu_thermal', 'gpu_thermal', 'reserve_thermal' do not match any of the regexes:
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Rename Rockchip rk3288 thermal subnodes
so that it ends with "-thermal"

Quoted 8 lines
Quoted 1 line

[...]

Applied, thanks!

[2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi

      commit: 7c96a5cf680ac7339999becd454e1f2fd9b258fb
[3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi
      commit: e58061b59787270a57839397e50bb4400b9e2de9

I of course also applied 1/3 in
https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/commit/?h=v5.12-armsoc/dts32&id=b840662bd55fb6dc9204585f071518123a87b59d

Just b4 didn't seem to be able to cope with 2 separate fetches for arm32+arm64.

Heiko

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip