Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef7791e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal 

Pull thermal SoC updates from Eduardo Valentin:
 "Several new things coming up. Specifics:

   - Rework of tsens and hisi thermal drivers

   - OF-thermal now allows sharing multiple cooling devices on maps

   - Added support for r8a7744 and R8A77970 on rcar thermal driver

   - Added support for r8a774a1 on rcar_gen3 thermal driver

   - New thermal driver stm32

   - Fixes on multiple thermal drivers: of-thermal, imx, qoriq, armada,
     qcom-spmi, rcar, da9062/61"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (41 commits)
  thermal: da9062/61: Prevent hardware access during system suspend
  thermal: rcar_thermal: Prevent doing work after unbind
  thermal: rcar_thermal: Prevent hardware access during system suspend
  thermal: rcar_gen3_thermal: add R8A77980 support
  dt-bindings: thermal: rcar-gen3-thermal: document R8A77980 bindings
  thermal: add stm32 thermal driver
  dt-bindings: stm32-thermal: add binding documentation
  thermal: rcar_thermal: add R8A77970 support
  dt-bindings: thermal: rcar-thermal: document R8A77970 bindings
  thermal: rcar_thermal: fix duplicate IRQ request
  dt-bindings: thermal: rcar: Add device tree support for r8a7744
  thermal/drivers/hisi: Add the dual clusters sensors for hi3660
  thermal/drivers/hisi: Add more sensors channel
  thermal/drivers/hisi: Remove pointless irq field
  thermal/drivers/hisi: Use platform_get_irq_byname
  thermal/drivers/hisi: Replace macro name with relevant sensor location
  thermal/drivers/hisi: Add multiple sensors support
  thermal/drivers/hisi: Prepare to support multiple sensors
  thermal/drivers/hisi: Factor out the probe functions
  thermal/drivers/hisi: Set the thermal zone private data to the sensor pointer
  ...
parents befa9363 760eea43

Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt

+5 −11
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ interrupt signal and status register to identify high PMIC die temperature. 


Required properties:

- compatible:      Should contain "qcom,spmi-temp-alarm".

- reg:             Specifies the SPMI address and length of the controller's

                   registers.

- reg:             Specifies the SPMI address.

- interrupts:      PMIC temperature alarm interrupt.

- #thermal-sensor-cells: Should be 0. See thermal.txt for a description.
@@ -20,7 +19,7 @@ Example: 


	pm8941_temp: thermal-alarm@2400 {

		compatible = "qcom,spmi-temp-alarm";

		reg = <0x2400 0x100>;

		reg = <0x2400>;

		interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;

		#thermal-sensor-cells = <0>;
@@ -36,19 +35,14 @@ Example: 
			thermal-sensors = <&pm8941_temp>;



			trips {

				passive {

					temperature = <1050000>;

				stage1 {

					temperature = <105000>;

					hysteresis = <2000>;

					type = "passive";

				};

				alert {

				stage2 {

					temperature = <125000>;

					hysteresis = <2000>;

					type = "hot";

				};

				crit {

					temperature = <145000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

Documentation/devicetree/bindings/thermal/qoriq-thermal.txt

+3 −3
Original line number Diff line number Diff line 
* Thermal Monitoring Unit (TMU) on Freescale QorIQ SoCs



Required properties:

- compatible : Must include "fsl,qoriq-tmu". The version of the device is

	determined by the TMU IP Block Revision Register (IPBRR0) at

	offset 0x0BF8.

- compatible : Must include "fsl,qoriq-tmu" or "fsl,imx8mq-tmu". The

	version of the device is determined by the TMU IP Block Revision

	Register (IPBRR0) at offset 0x0BF8.

	Table of correspondences between IPBRR0 values and example  chips:

		Value           Device

		----------      -----

Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt

+4 −1
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ inside the LSI. 
Required properties:

- compatible		: "renesas,<soctype>-thermal",

			  Examples with soctypes are:

			    - "renesas,r8a774a1-thermal" (RZ/G2M)

			    - "renesas,r8a7795-thermal" (R-Car H3)

			    - "renesas,r8a7796-thermal" (R-Car M3-W)

			    - "renesas,r8a77965-thermal" (R-Car M3-N)

			    - "renesas,r8a77980-thermal" (R-Car V3H)

- reg			: Address ranges of the thermal registers. Each sensor

			  needs one address range. Sorting must be done in

			  increasing order according to datasheet, i.e.
@@ -19,7 +21,8 @@ Required properties: 


Optional properties:



- interrupts           : interrupts routed to the TSC (3 for H3, M3-W and M3-N)

- interrupts		: interrupts routed to the TSC (3 for H3, M3-W, M3-N,

			  and V3H)

- power-domain		: Must contain a reference to the power domain. This

			  property is mandatory if the thermal sensor instance

			  is part of a controllable power domain.

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

+4 −2
Original line number Diff line number Diff line
@@ -4,15 +4,17 @@ Required properties: 
- compatible		: "renesas,thermal-<soctype>",

			   "renesas,rcar-gen2-thermal" (with thermal-zone) or

			   "renesas,rcar-thermal" (without thermal-zone) as

                           fallback except R-Car D3.

                           fallback except R-Car V3M/D3.

			  Examples with soctypes are:

			    - "renesas,thermal-r8a73a4" (R-Mobile APE6)

			    - "renesas,thermal-r8a7743" (RZ/G1M)

			    - "renesas,thermal-r8a7744" (RZ/G1N)

			    - "renesas,thermal-r8a7779" (R-Car H1)

			    - "renesas,thermal-r8a7790" (R-Car H2)

			    - "renesas,thermal-r8a7791" (R-Car M2-W)

			    - "renesas,thermal-r8a7792" (R-Car V2H)

			    - "renesas,thermal-r8a7793" (R-Car M2-N)

			    - "renesas,thermal-r8a77970" (R-Car V3M)

			    - "renesas,thermal-r8a77995" (R-Car D3)

- reg			: Address range of the thermal registers.

			  The 1st reg will be recognized as common register
@@ -21,7 +23,7 @@ Required properties: 
Option properties:



- interrupts		: If present should contain 3 interrupts for

                          R-Car D3 or 1 interrupt otherwise.

                          R-Car V3M/D3 or 1 interrupt otherwise.



Example (non interrupt support):

Documentation/devicetree/bindings/thermal/stm32-thermal.txt

0 → 100644
+61 −0
Original line number Diff line number Diff line 
Binding for Thermal Sensor for STMicroelectronics STM32 series of SoCs.



On STM32 SoCs, the Digital Temperature Sensor (DTS) is in charge of managing an

analog block which delivers a frequency depending on the internal SoC's

temperature. By using a reference frequency, DTS is able to provide a sample

number which can be translated into a temperature by the user.



DTS provides interrupt notification mechanism by threshold. This mechanism

offers two temperature trip points: passive and critical. The first is intended

for passive cooling notification while the second is used for over-temperature

reset.



Required parameters:

-------------------



compatible: 	Should be "st,stm32-thermal"

reg: 		This should be the physical base address and length of the

		sensor's registers.

clocks: 	Phandle of the clock used by the thermal sensor.

		  See: Documentation/devicetree/bindings/clock/clock-bindings.txt

clock-names: 	Should be "pclk" for register access clock and reference clock.

		  See: Documentation/devicetree/bindings/resource-names.txt

#thermal-sensor-cells: Should be 0. See ./thermal.txt for a description.

interrupts:	Standard way to define interrupt number.



Example:



	thermal-zones {

		cpu_thermal: cpu-thermal {

			polling-delay-passive = <0>;

			polling-delay = <0>;



			thermal-sensors = <&thermal>;



			trips {

				cpu_alert1: cpu-alert1 {

					temperature = <85000>;

					hysteresis = <0>;

					type = "passive";

				};



				cpu-crit: cpu-crit {

					temperature = <120000>;

					hysteresis = <0>;

					type = "critical";

				};

			};



			cooling-maps {

			};

		};

	};



	thermal: thermal@50028000 {

		compatible = "st,stm32-thermal";

		reg = <0x50028000 0x100>;

		clocks = <&rcc TMPSENS>;

		clock-names = "pclk";

		#thermal-sensor-cells = <0>;

		interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;

	};