diff mbox series

[RESEND,2/4] arm64: dts: marvell: add thermal-zone node in ap806 DTSI file

Message ID 20180830081501.11569-2-miquel.raynal@bootlin.com (mailing list archive)
State New, archived
Headers show
Series [RESEND,1/4] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon | expand

Commit Message

Miquel Raynal Aug. 30, 2018, 8:14 a.m. UTC
Add a thermal-zone node and fill in all the sensors available in an
ap806 (one in the IC plus one per CPU).

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

Comments

Gregory CLEMENT Sept. 21, 2018, 2:15 p.m. UTC | #1
Hi Miquel,
 
 On jeu., août 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Add a thermal-zone node and fill in all the sensors available in an
> ap806 (one in the IC plus one per CPU).
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 60 +++++++++++++++++++
>  1 file changed, 60 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> index 3da3a13f7ee1..7d94c1fa592a 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> @@ -6,6 +6,7 @@
>   */
>  
>  #include <dt-bindings/interrupt-controller/arm-gic.h>
> +#include <dt-bindings/thermal/thermal.h>
>  
>  /dts-v1/;
>  
> @@ -265,8 +266,67 @@
>  				ap_thermal: thermal-sensor@80 {
>  					compatible = "marvell,armada-ap806-thermal";
>  					reg = <0x80 0x10>;
> +					#thermal-sensor-cells = <1>;
>  				};
>  			};
>  		};
>  	};
> +
> +	/*
> +	 * The thermal IP features one internal sensor plus, if applicable, one
> +	 * remote channel wired to one sensor per CPU.
> +	 *
> +	 * The cooling maps are always empty as there are no cooling devices.
> +	 */
> +	thermal-zones {
> +		ap_thermal_ic: ap-thermal-ic {
> +			polling-delay-passive = <1000>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&ap_thermal 0>;
> +
> +			trips {	};
> +			cooling-maps { };
> +		};
> +
> +		ap_thermal_cpu1: ap-thermal-cpu1 {
> +			polling-delay-passive = <1000>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&ap_thermal 1>;
> +
> +			trips { };
> +			cooling-maps { };
> +		};
> +
> +		ap_thermal_cpu2: ap-thermal-cpu2 {
> +			polling-delay-passive = <1000>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&ap_thermal 2>;
> +
> +			trips { };
> +			cooling-maps { };
> +		};
> +
> +		ap_thermal_cpu3: ap-thermal-cpu3 {
> +			polling-delay-passive = <1000>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&ap_thermal 3>;
> +
> +			trips { };
> +			cooling-maps { };
> +		};
> +
> +		ap_thermal_cpu4: ap-thermal-cpu4 {
> +			polling-delay-passive = <1000>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&ap_thermal 4>;
> +
> +			trips { };
> +			cooling-maps { };
> +		};
> +	};
>  };
> -- 
> 2.17.1
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 3da3a13f7ee1..7d94c1fa592a 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -6,6 +6,7 @@ 
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/thermal/thermal.h>
 
 /dts-v1/;
 
@@ -265,8 +266,67 @@ 
 				ap_thermal: thermal-sensor@80 {
 					compatible = "marvell,armada-ap806-thermal";
 					reg = <0x80 0x10>;
+					#thermal-sensor-cells = <1>;
 				};
 			};
 		};
 	};
+
+	/*
+	 * The thermal IP features one internal sensor plus, if applicable, one
+	 * remote channel wired to one sensor per CPU.
+	 *
+	 * The cooling maps are always empty as there are no cooling devices.
+	 */
+	thermal-zones {
+		ap_thermal_ic: ap-thermal-ic {
+			polling-delay-passive = <1000>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&ap_thermal 0>;
+
+			trips {	};
+			cooling-maps { };
+		};
+
+		ap_thermal_cpu1: ap-thermal-cpu1 {
+			polling-delay-passive = <1000>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&ap_thermal 1>;
+
+			trips { };
+			cooling-maps { };
+		};
+
+		ap_thermal_cpu2: ap-thermal-cpu2 {
+			polling-delay-passive = <1000>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&ap_thermal 2>;
+
+			trips { };
+			cooling-maps { };
+		};
+
+		ap_thermal_cpu3: ap-thermal-cpu3 {
+			polling-delay-passive = <1000>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&ap_thermal 3>;
+
+			trips { };
+			cooling-maps { };
+		};
+
+		ap_thermal_cpu4: ap-thermal-cpu4 {
+			polling-delay-passive = <1000>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&ap_thermal 4>;
+
+			trips { };
+			cooling-maps { };
+		};
+	};
 };