Commit c2802302 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:

 - Tegra DT binding documentation for Tegra194

 - Armada now supports ap806 and cp110

 - RCAR thermal now supports R8A774C0 and R8A77990

 - Fixes on thermal_hwmon, IMX, generic-ADC, ST, RCAR, Broadcom,
   Uniphier, QCOM, Tegra, PowerClamp, and Armada thermal drivers.

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (22 commits)
  thermal: generic-adc: Fix adc to temp interpolation
  thermal: rcar_thermal: add R8A77990 support
  dt-bindings: thermal: rcar-thermal: add R8A77990 support
  thermal: rcar_thermal: add R8A774C0 support
  dt-bindings: thermal: rcar-thermal: add R8A774C0 support
  dt-bindings: cp110: document the thermal interrupt capabilities
  dt-bindings: ap806: document the thermal interrupt capabilities
  MAINTAINERS: thermal: add entry for Marvell MVEBU thermal driver
  thermal: armada: add overheat interrupt support
  thermal: st: fix Makefile typo
  thermal: uniphier: Convert to SPDX identifier
  thermal/intel_powerclamp: Change to use DEFINE_SHOW_ATTRIBUTE macro
  thermal: tegra: soctherm: Change to use DEFINE_SHOW_ATTRIBUTE macro
  dt-bindings: thermal: tegra-bpmp: Add Tegra194 support
  thermal: imx: save one condition block for normal case of nvmem initialization
  thermal: imx: fix for dependency on cpu-freq
  thermal: tsens: qcom: do not create duplicate regmap debugfs entries
  thermal: armada: Use PTR_ERR_OR_ZERO in armada_thermal_probe_legacy()
  dt-bindings: thermal: rcar-gen3-thermal: All variants use 3 interrupts
  thermal: broadcom: use devm_thermal_zone_of_sensor_register
  ...
parents a6701241 9d216211

Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt

+7 −0
Original line number Diff line number Diff line
@@ -114,12 +114,17 @@ Documentation/devicetree/bindings/thermal/thermal.txt 
The thermal IP can probe the temperature all around the processor. It

may feature several channels, each of them wired to one sensor.



It is possible to setup an overheat interrupt by giving at least one

critical point to any subnode of the thermal-zone node.



Required properties:

- compatible: must be one of:

  * marvell,armada-ap806-thermal

- reg: register range associated with the thermal functions.



Optional properties:

- interrupts: overheat interrupt handle. Should point to line 18 of the

  SEI irqchip. See interrupt-controller/interrupts.txt

- #thermal-sensor-cells: shall be <1> when thermal-zones subnodes refer

  to this IP and represents the channel ID. There is one sensor per

  channel. O refers to the thermal IP internal channel, while positive
@@ -133,6 +138,8 @@ ap_syscon1: system-controller@6f8000 { 
	ap_thermal: thermal-sensor@80 {

		compatible = "marvell,armada-ap806-thermal";

		reg = <0x80 0x10>;

		interrupt-parent = <&sei>;

		interrupts = <18>;

		#thermal-sensor-cells = <1>;

	};

};

Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt

+9 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ Thermal: 
The thermal IP can probe the temperature all around the processor. It

may feature several channels, each of them wired to one sensor.



It is possible to setup an overheat interrupt by giving at least one

critical point to any subnode of the thermal-zone node.



For common binding part and usage, refer to

Documentation/devicetree/bindings/thermal/thermal.txt
@@ -208,6 +211,11 @@ Required properties: 
- reg: register range associated with the thermal functions.



Optional properties:

- interrupts-extended: overheat interrupt handle. Should point to

  a line of the ICU-SEI irqchip (116 is what is usually used by the

  firmware). The ICU-SEI will redirect towards interrupt line #37 of the

  AP SEI which is shared across all CPs.

  See interrupt-controller/interrupts.txt

- #thermal-sensor-cells: shall be <1> when thermal-zones subnodes refer

  to this IP and represents the channel ID. There is one sensor per

  channel. O refers to the thermal IP internal channel.
@@ -220,6 +228,7 @@ CP110_LABEL(syscon1): system-controller@6f8000 { 
	CP110_LABEL(thermal): thermal-sensor@70 {

		compatible = "marvell,armada-cp110-thermal";

		reg = <0x70 0x10>;

		interrupts-extended = <&CP110_LABEL(icu_sei) 116 IRQ_TYPE_LEVEL_HIGH>;

		#thermal-sensor-cells = <1>;

	};

};

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

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ Required properties: 


Optional properties:



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

			  and V3H)

- interrupts		: interrupts routed to the TSC (must be 3).

- 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,17 +4,19 @@ 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 V3M/D3.

                           fallback except R-Car V3M/E3/D3 and RZ/G2E.

			  Examples with soctypes are:

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

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

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

			    - "renesas,thermal-r8a774c0" (RZ/G2E)

			    - "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-r8a77990" (R-Car E3)

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

- reg			: Address range of the thermal registers.

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



- interrupts		: If present should contain 3 interrupts for

                          R-Car V3M/D3 or 1 interrupt otherwise.

                          R-Car V3M/E3/D3 and RZ/G2E or 1 interrupt otherwise.



Example (non interrupt support):

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -9109,6 +9109,11 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/phy/marvell10g.c



MARVELL MVEBU THERMAL DRIVER

M:	Miquel Raynal <miquel.raynal@bootlin.com>

S:	Maintained

F:	drivers/thermal/armada_thermal.c



MARVELL MVNETA ETHERNET DRIVER

M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>

L:	netdev@vger.kernel.org

CRA Git | Maintained and supported by SUSTech CRA and CCSE