* [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi
@ 2021-01-17 15:09 Johan Jonker
2021-01-17 15:09 ` [PATCH 2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi Johan Jonker
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Johan Jonker @ 2021-01-17 15:09 UTC (permalink / raw)
To: heiko; +Cc: robh+dt, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel
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(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi
2021-01-17 15:09 [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Johan Jonker
@ 2021-01-17 15:09 ` Johan Jonker
2021-01-17 15:09 ` [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi Johan Jonker
2021-01-18 12:57 ` (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Heiko Stuebner
2 siblings, 0 replies; 6+ messages in thread
From: Johan Jonker @ 2021-01-17 15:09 UTC (permalink / raw)
To: heiko; +Cc: robh+dt, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel
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 <jbx6244@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi
2021-01-17 15:09 [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Johan Jonker
2021-01-17 15:09 ` [PATCH 2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi Johan Jonker
@ 2021-01-17 15:09 ` Johan Jonker
2021-01-18 14:20 ` Robin Murphy
2021-01-18 12:57 ` (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Heiko Stuebner
2 siblings, 1 reply; 6+ messages in thread
From: Johan Jonker @ 2021-01-17 15:09 UTC (permalink / raw)
To: heiko; +Cc: robh+dt, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel
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>;
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi
2021-01-17 15:09 ` [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi Johan Jonker
@ 2021-01-18 14:20 ` Robin Murphy
0 siblings, 0 replies; 6+ messages in thread
From: Robin Murphy @ 2021-01-18 14:20 UTC (permalink / raw)
To: Johan Jonker, heiko
Cc: linux-rockchip, robh+dt, linux-kernel, linux-arm-kernel, devicetree
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>;
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi
2021-01-17 15:09 [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Johan Jonker
2021-01-17 15:09 ` [PATCH 2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi Johan Jonker
2021-01-17 15:09 ` [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi Johan Jonker
@ 2021-01-18 12:57 ` Heiko Stuebner
2021-01-18 13:01 ` Heiko Stübner
2 siblings, 1 reply; 6+ messages in thread
From: Heiko Stuebner @ 2021-01-18 12:57 UTC (permalink / raw)
To: Johan Jonker
Cc: Heiko Stuebner, linux-arm-kernel, linux-kernel, devicetree,
robh+dt, linux-rockchip
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>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi
2021-01-18 12:57 ` (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Heiko Stuebner
@ 2021-01-18 13:01 ` Heiko Stübner
0 siblings, 0 replies; 6+ messages in thread
From: Heiko Stübner @ 2021-01-18 13:01 UTC (permalink / raw)
To: Johan Jonker
Cc: linux-arm-kernel, linux-kernel, devicetree, robh+dt, linux-rockchip
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-18 14:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-17 15:09 [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Johan Jonker
2021-01-17 15:09 ` [PATCH 2/3] arm64: dts: rockchip: rename thermal subnodes for rk3368.dtsi Johan Jonker
2021-01-17 15:09 ` [PATCH 3/3] arm64: dts: rockchip: rename thermal subnodes for rk3399.dtsi Johan Jonker
2021-01-18 14:20 ` Robin Murphy
2021-01-18 12:57 ` (subset) [PATCH 1/3] ARM: dts: rockchip: rename thermal subnodes for rk3288.dtsi Heiko Stuebner
2021-01-18 13:01 ` Heiko Stübner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).