diff mbox series

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

Message ID 20210117150953.16475-3-jbx6244@gmail.com (mailing list archive)
State New
Headers show
Series [1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi | expand

Commit Message

Johan Jonker Jan. 17, 2021, 3:09 p.m. UTC
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 <jbx6244@gmail.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Robin Murphy Jan. 18, 2021, 2:20 p.m. UTC | #1
On 2021-01-17 15:09, Johan Jonker wrote:
> 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 <jbx6244@gmail.com>
> ---
>   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.

> 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>;
>   
>
diff mbox series

Patch

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>;