[RESEND PATCH 1/4] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon

[RESEND PATCH 1/4] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon

[Miquel Raynal]

New bindings impose to declare the thermal IP from within a new syscon.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 14 ++++++++++----
 arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 18 ++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 92215342b453..3da3a13f7ee1 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -256,10 +256,16 @@
 				};
 			};
 
-			ap_thermal: thermal@6f808c {
-				compatible = "marvell,armada-ap806-thermal";
-				reg = <0x6f808c 0x4>,
-				      <0x6f8084 0x8>;
+			ap_syscon1: system-controller@6f8000 {
+				compatible = "syscon", "simple-mfd";
+				reg = <0x6f8000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				ap_thermal: thermal-sensor@80 {
+					compatible = "marvell,armada-ap806-thermal";
+					reg = <0x80 0x10>;
+				};
 			};
 		};
 	};
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index 4315eeb0a473..62842fae2571 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -177,12 +177,6 @@
 			interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
-		CP110_LABEL(thermal): thermal@400078 {
-			compatible = "marvell,armada-cp110-thermal";
-			reg = <0x400078 0x4>,
-			<0x400070 0x8>;
-		};
-
 		CP110_LABEL(syscon0): system-controller@440000 {
 			compatible = "syscon", "simple-mfd";
 			reg = <0x440000 0x2000>;
@@ -223,6 +217,18 @@
 			};
 		};
 
+		CP110_LABEL(syscon1): system-controller@400000 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0x400000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			CP110_LABEL(thermal): thermal-sensor@70 {
+				compatible = "marvell,armada-cp110-thermal";
+				reg = <0x70 0x10>;
+			};
+		};
+
 		CP110_LABEL(usb3_0): usb3@500000 {
 			compatible = "marvell,armada-8k-xhci",
 			"generic-xhci";
-- 
2.17.1

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

[Miquel Raynal]

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(+)

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

[RESEND PATCH 3/4] arm64: dts: marvell: add macro to make distinction between node names

[Miquel Raynal]

Because the label is different between CPs, the full path of a node is
unique. However, when referring to the end of the path only (the node
name), this name is not unique anymore.

The *thermal_zone_of_sensor_register() functions of the thermal core
present this limitation and prevent having a thermal-zone per CP.

Add a macro to make the distinction between node names to solve this
situation.

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

diff --git a/arch/arm64/boot/dts/marvell/armada-common.dtsi b/arch/arm64/boot/dts/marvell/armada-common.dtsi
index d5e8aedec188..b29c6405d214 100644
--- a/arch/arm64/boot/dts/marvell/armada-common.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-common.dtsi
@@ -7,4 +7,5 @@
 #define PASTER(x, y) x ## y
 #define EVALUATOR(x, y) PASTER(x, y)
 #define CP110_LABEL(name) EVALUATOR(CP110_NAME, EVALUATOR(_, name))
+#define CP110_NODE_NAME(name) EVALUATOR(CP110_NAME, EVALUATOR(-, name))
 #define ADDRESSIFY(addr) EVALUATOR(0x, addr)
-- 
2.17.1

[RESEND PATCH 4/4] arm64: dts: marvell: add thermal-zone node in cp110 DTSI file

[Miquel Raynal]

Add a thermal-zone node and fill in all the sensors available in a
cp110 (only one in the thermal IP).

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

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index 62842fae2571..d9b50ad0bc6c 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -6,6 +6,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/mvebu-icu.h>
+#include <dt-bindings/thermal/thermal.h>
 
 #include "armada-common.dtsi"
 
@@ -19,6 +20,23 @@
 	 * save one indentation level
 	 */
 	CP110_NAME: CP110_NAME { };
+
+	/*
+	 * CPs only have one sensor in the thermal IC.
+	 *
+	 * The cooling maps are empty as there are no cooling devices.
+	 */
+	thermal-zones {
+		CP110_LABEL(thermal_ic): CP110_NODE_NAME(thermal-ic) {
+			polling-delay-passive = <1000>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&CP110_LABEL(thermal) 0>;
+
+			trips {	};
+			cooling-maps { };
+		};
+	};
 };
 
 &CP110_NAME {
@@ -226,6 +244,7 @@
 			CP110_LABEL(thermal): thermal-sensor@70 {
 				compatible = "marvell,armada-cp110-thermal";
 				reg = <0x70 0x10>;
+				#thermal-sensor-cells = <1>;
 			};
 		};
 
-- 
2.17.1

Re: [RESEND PATCH 1/4] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon

[Gregory CLEMENT]

Hi Miquel,
 
 On jeu., août 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> New bindings impose to declare the thermal IP from within a new syscon.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 14 ++++++++++----
>  arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 18 ++++++++++++------
>  2 files changed, 22 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> index 92215342b453..3da3a13f7ee1 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> @@ -256,10 +256,16 @@
>  				};
>  			};
>  
> -			ap_thermal: thermal@6f808c {
> -				compatible = "marvell,armada-ap806-thermal";
> -				reg = <0x6f808c 0x4>,
> -				      <0x6f8084 0x8>;
> +			ap_syscon1: system-controller@6f8000 {
> +				compatible = "syscon", "simple-mfd";
> +				reg = <0x6f8000 0x1000>;
> +				#address-cells = <1>;
> +				#size-cells = <1>;
> +
> +				ap_thermal: thermal-sensor@80 {
> +					compatible = "marvell,armada-ap806-thermal";
> +					reg = <0x80 0x10>;
> +				};
>  			};
>  		};
>  	};
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
> index 4315eeb0a473..62842fae2571 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
> @@ -177,12 +177,6 @@
>  			interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
>  		};
>  
> -		CP110_LABEL(thermal): thermal@400078 {
> -			compatible = "marvell,armada-cp110-thermal";
> -			reg = <0x400078 0x4>,
> -			<0x400070 0x8>;
> -		};
> -
>  		CP110_LABEL(syscon0): system-controller@440000 {
>  			compatible = "syscon", "simple-mfd";
>  			reg = <0x440000 0x2000>;
> @@ -223,6 +217,18 @@
>  			};
>  		};
>  
> +		CP110_LABEL(syscon1): system-controller@400000 {
> +			compatible = "syscon", "simple-mfd";
> +			reg = <0x400000 0x1000>;
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +
> +			CP110_LABEL(thermal): thermal-sensor@70 {
> +				compatible = "marvell,armada-cp110-thermal";
> +				reg = <0x70 0x10>;
> +			};
> +		};
> +
>  		CP110_LABEL(usb3_0): usb3@500000 {
>  			compatible = "marvell,armada-8k-xhci",
>  			"generic-xhci";
> -- 
> 2.17.1
>

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

[Gregory CLEMENT]

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
>

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [RESEND PATCH 3/4] arm64: dts: marvell: add macro to make distinction between node names

[Gregory CLEMENT]

Hi Miquel,
 
 On jeu., août 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Because the label is different between CPs, the full path of a node is
> unique. However, when referring to the end of the path only (the node
> name), this name is not unique anymore.
>
> The *thermal_zone_of_sensor_register() functions of the thermal core
> present this limitation and prevent having a thermal-zone per CP.
>
> Add a macro to make the distinction between node names to solve this
> situation.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-common.dtsi | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-common.dtsi b/arch/arm64/boot/dts/marvell/armada-common.dtsi
> index d5e8aedec188..b29c6405d214 100644
> --- a/arch/arm64/boot/dts/marvell/armada-common.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-common.dtsi
> @@ -7,4 +7,5 @@
>  #define PASTER(x, y) x ## y
>  #define EVALUATOR(x, y) PASTER(x, y)
>  #define CP110_LABEL(name) EVALUATOR(CP110_NAME, EVALUATOR(_, name))
> +#define CP110_NODE_NAME(name) EVALUATOR(CP110_NAME, EVALUATOR(-, name))
>  #define ADDRESSIFY(addr) EVALUATOR(0x, addr)
> -- 
> 2.17.1
>

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [RESEND PATCH 4/4] arm64: dts: marvell: add thermal-zone node in cp110 DTSI file

[Gregory CLEMENT]

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 a
> cp110 (only one in the thermal IP).
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
> index 62842fae2571..d9b50ad0bc6c 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
> @@ -6,6 +6,7 @@
>   */
>  
>  #include <dt-bindings/interrupt-controller/mvebu-icu.h>
> +#include <dt-bindings/thermal/thermal.h>
>  
>  #include "armada-common.dtsi"
>  
> @@ -19,6 +20,23 @@
>  	 * save one indentation level
>  	 */
>  	CP110_NAME: CP110_NAME { };
> +
> +	/*
> +	 * CPs only have one sensor in the thermal IC.
> +	 *
> +	 * The cooling maps are empty as there are no cooling devices.
> +	 */
> +	thermal-zones {
> +		CP110_LABEL(thermal_ic): CP110_NODE_NAME(thermal-ic) {
> +			polling-delay-passive = <1000>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&CP110_LABEL(thermal) 0>;
> +
> +			trips {	};
> +			cooling-maps { };
> +		};
> +	};
>  };
>  
>  &CP110_NAME {
> @@ -226,6 +244,7 @@
>  			CP110_LABEL(thermal): thermal-sensor@70 {
>  				compatible = "marvell,armada-cp110-thermal";
>  				reg = <0x70 0x10>;
> +				#thermal-sensor-cells = <1>;
>  			};
>  		};
>  
> -- 
> 2.17.1
>

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel