diff mbox series

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

Message ID 20210117150953.16475-1-jbx6244@gmail.com
State Accepted
Commit b840662bd55fb6dc9204585f071518123a87b59d
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/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 <jbx6244@gmail.com>
---
 arch/arm/boot/dts/rk3288.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Heiko Stuebner Jan. 18, 2021, 12:57 p.m. UTC | #1
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 <heiko@sntech.de>
Heiko Stuebner Jan. 18, 2021, 1:01 p.m. UTC | #2
Am Montag, 18. Januar 2021, 13:57:33 CET schrieb Heiko Stuebner:
> 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


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

Patch

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 */