2023-03-12 20:13:26

by Krzysztof Kozlowski

Subject: [PATCH] arm64: dts: marvell: align thermal node names with bindings

Bindings expect thermal node names to end with '-thermal':

armada-8040-db.dtb: thermal-zones: 'ap-thermal-cpu0', ... do not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 10 +++++-----
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
index 4e6d29ad32eb..2c920e22cec2 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
@@ -317,7 +317,7 @@ ap_thermal: thermal-sensor@80 {
* first one that will have a critical trip point will be chosen.
*/
thermal-zones {
- ap_thermal_ic: ap-thermal-ic {
+ ap_thermal_ic: ap-ic-thermal {
polling-delay-passive = <0>; /* Interrupt driven */
polling-delay = <0>; /* Interrupt driven */

@@ -334,7 +334,7 @@ ap_crit: ap-crit {
cooling-maps { };
};

- ap_thermal_cpu0: ap-thermal-cpu0 {
+ ap_thermal_cpu0: ap-cpu0-thermal {
polling-delay-passive = <1000>;
polling-delay = <1000>;

@@ -367,7 +367,7 @@ map0_emerg: map0-ermerg {
};
};

- ap_thermal_cpu1: ap-thermal-cpu1 {
+ ap_thermal_cpu1: ap-cpu1-thermal {
polling-delay-passive = <1000>;
polling-delay = <1000>;

@@ -400,7 +400,7 @@ map1_emerg: map1-emerg {
};
};

- ap_thermal_cpu2: ap-thermal-cpu2 {
+ ap_thermal_cpu2: ap-cpu2-thermal {
polling-delay-passive = <1000>;
polling-delay = <1000>;

@@ -433,7 +433,7 @@ map2_emerg: map2-emerg {
};
};

- ap_thermal_cpu3: ap-thermal-cpu3 {
+ ap_thermal_cpu3: ap-cpu3-thermal {
polling-delay-passive = <1000>;
polling-delay = <1000>;

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 7d0043824f2a..0cc9ee9871e7 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -25,7 +25,7 @@ / {
* The cooling maps are empty as there are no cooling devices.
*/
thermal-zones {
- CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(thermal-ic) {
+ CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(ic-thermal) {
polling-delay-passive = <0>; /* Interrupt driven */
polling-delay = <0>; /* Interrupt driven */

--
2.34.1

2023-04-07 15:16:29

by Gregory CLEMENT

Subject: Re: [PATCH] arm64: dts: marvell: align thermal node names with bindings

Krzysztof Kozlowski <[email protected]> writes:

> Bindings expect thermal node names to end with '-thermal':
>
> armada-8040-db.dtb: thermal-zones: 'ap-thermal-cpu0', ... do not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', 'pinctrl-[0-9]+'

Applied on mvebu/dt64

Thanks,

Gregory


>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 10 +++++-----
> arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +-
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> index 4e6d29ad32eb..2c920e22cec2 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> @@ -317,7 +317,7 @@ ap_thermal: thermal-sensor@80 {
> * first one that will have a critical trip point will be chosen.
> */
> thermal-zones {
> - ap_thermal_ic: ap-thermal-ic {
> + ap_thermal_ic: ap-ic-thermal {
> polling-delay-passive = <0>; /* Interrupt driven */
> polling-delay = <0>; /* Interrupt driven */
>
> @@ -334,7 +334,7 @@ ap_crit: ap-crit {
> cooling-maps { };
> };
>
> - ap_thermal_cpu0: ap-thermal-cpu0 {
> + ap_thermal_cpu0: ap-cpu0-thermal {
> polling-delay-passive = <1000>;
> polling-delay = <1000>;
>
> @@ -367,7 +367,7 @@ map0_emerg: map0-ermerg {
> };
> };
>
> - ap_thermal_cpu1: ap-thermal-cpu1 {
> + ap_thermal_cpu1: ap-cpu1-thermal {
> polling-delay-passive = <1000>;
> polling-delay = <1000>;
>
> @@ -400,7 +400,7 @@ map1_emerg: map1-emerg {
> };
> };
>
> - ap_thermal_cpu2: ap-thermal-cpu2 {
> + ap_thermal_cpu2: ap-cpu2-thermal {
> polling-delay-passive = <1000>;
> polling-delay = <1000>;
>
> @@ -433,7 +433,7 @@ map2_emerg: map2-emerg {
> };
> };
>
> - ap_thermal_cpu3: ap-thermal-cpu3 {
> + ap_thermal_cpu3: ap-cpu3-thermal {
> polling-delay-passive = <1000>;
> polling-delay = <1000>;
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> index 7d0043824f2a..0cc9ee9871e7 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> @@ -25,7 +25,7 @@ / {
> * The cooling maps are empty as there are no cooling devices.
> */
> thermal-zones {
> - CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(thermal-ic) {
> + CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(ic-thermal) {
> polling-delay-passive = <0>; /* Interrupt driven */
> polling-delay = <0>; /* Interrupt driven */
>
> --
> 2.34.1
>

--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com