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

Subsystems: the rest

STALE2021d LANDED

Landed in mainline as b840662bd55f on 2021-01-18.

6 messages, 3 authors, 2021-01-18 · open the first message on its own page

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

From: Johan Jonker <hidden>
Date: 2021-01-17 15:11:23

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

Signed-off-by: Johan Jonker <redacted>
---
 arch/arm/boot/dts/rk3288.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 01ea1f170..29ffe2eb9 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -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 */
 
-- 
2.11.0

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

From: Johan Jonker <hidden>
Date: 2021-01-17 15:11:23

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

Signed-off-by: Johan Jonker <redacted>
---
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index dad1a00e6..cd8274a35 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -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 */
 
-- 
2.11.0

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

From: Johan Jonker <hidden>
Date: 2021-01-17 15:11:24

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

Signed-off-by: Johan Jonker <redacted>
---
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
index c88295782..b20774081 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
@@ -126,7 +126,7 @@
 };
 
 &thermal_zones {
-	cpu_thermal: cpu {
+	cpu_thermal: cpu-thermal {
 		polling-delay-passive = <100>;
 		polling-delay = <1000>;
 		thermal-sensors = <&tsadc 0>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 4e94b7ebd..3de493ad6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -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>;
 
-- 
2.11.0

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

From: Robin Murphy <robin.murphy@arm.com>
Date: 2021-01-18 14:22:55

On 2021-01-17 15:09, Johan Jonker wrote:
quoted hunk
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

Signed-off-by: Johan Jonker <redacted>
---
  arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +-
  arch/arm64/boot/dts/rockchip/rk3399.dtsi        | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
index c88295782..b20774081 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
@@ -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 hunk
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 4e94b7ebd..3de493ad6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -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>;
  

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

From: Heiko Stuebner <heiko@sntech.de>
Date: 2021-01-18 13:06:45

On Sun, 17 Jan 2021 16:09:51 +0100, Johan Jonker wrote:
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,
-- 
Heiko Stuebner [off-list ref]

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

From: Heiko Stübner <heiko@sntech.de>
Date: 2021-01-18 13:10:33

Am Montag, 18. Januar 2021, 13:57:33 CET schrieb Heiko Stuebner:
On Sun, 17 Jan 2021 16:09:51 +0100, Johan Jonker wrote:
quoted
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
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

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help