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

Commit 5fd41f2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 

Pull thermal updates from Zhang Rui:
 "Specifics:

   - adds full support for 2 types of Thermal Controllers produced by
     STMicroelectronics.  One is a more traditional memory mapped
     variant, the other is controlled solely by system configuration
     registers.  From Lee Jones.

   - add TMU (Thermal Management Unit) support for Exynos3250 Soc.
     From Chanwoo Choi.

   - add critical and passive trip point support for int3403 thermal
     driver.  From Srinivas Pandruvada.

   - a couple of small fixes/cleanups from Javi Merino, and Geert
     Uytterhoeven"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: document struct thermal_zone_device and thermal_governor
  thermal: cpu_cooling: fix typo highjack -> hijack
  thermal: rcar: Document SoC-specific bindings
  thermal: samsung: Add TMU support for Exynos3250 SoC
  thermal: exynos: fix ordering in exynos_tmu_remove()
  thermal: allow building dove_thermal with mvebu
  thermal: sti: Add support for ST's Memory Mapped based Thermal controller
  thermal: sti: Add support for ST's System Config Register based Thermal controller
  thermal: sti: Introduce ST Thermal core code
  thermal: sti: Supply Device Tree documentation
  Thermal: int3403: Add CRT and PSV trip
parents 2213d7c2 47d104ba

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

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
** Required properties:



- compatible : One of the following:

	       "samsung,exynos3250-tmu"

	       "samsung,exynos4412-tmu"

	       "samsung,exynos4210-tmu"

	       "samsung,exynos5250-tmu"

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

+12 −6
Original line number Diff line number Diff line 
* Renesas R-Car Thermal



Required properties:

- compatible		: "renesas,rcar-thermal"

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

			  as fallback.

			  Examples with soctypes are:

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

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

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

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

- reg			: Address range of the thermal registers.

			  The 1st reg will be recognized as common register

			  if it has "interrupts".
@@ -12,18 +18,18 @@ Option properties: 


Example (non interrupt support):



thermal@e61f0100 {

	compatible = "renesas,rcar-thermal";

	reg = <0xe61f0100 0x38>;

thermal@ffc48000 {

	compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";

	reg = <0xffc48000 0x38>;

};



Example (interrupt support):



thermal@e61f0000 {

	compatible = "renesas,rcar-thermal";

	compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";

	reg = <0xe61f0000 0x14

		0xe61f0100 0x38

		0xe61f0200 0x38

		0xe61f0300 0x38>;

	interrupts = <0 69 4>;

	interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;

};

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Binding for Thermal Sensor driver for STMicroelectronics STi series of SoCs.



Required parameters:

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



compatible : 	st,<SoC>-<module>-thermal; should be one of:

		  "st,stih415-sas-thermal",

		  "st,stih415-mpe-thermal",

		  "st,stih416-sas-thermal"

		  "st,stih416-mpe-thermal"

		  "st,stid127-thermal" or

		  "st,stih407-thermal"

		according to the SoC type (stih415, stih416, stid127, stih407)

		and module type (sas or mpe). On stid127 & stih407 there is only

		one die/module, so there is no module type in the compatible

		string.

clock-names : 	Should be "thermal".

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

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

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



Optional parameters:

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



reg : 		For non-sysconf based sensors, this should be the physical base

		address and length of the sensor's registers.

interrupts :	Standard way to define interrupt number.

		Interrupt is mandatory to be defined when compatible is

		"stih416-mpe-thermal".

		  NB: For thermal sensor's for which no interrupt has been

		  defined, a polling delay of 1000ms will be used to read the

		  temperature from device.



Example:



	temp1@fdfe8000 {

		compatible	= "st,stih416-mpe-thermal";

		reg		= <0xfdfe8000 0x10>;

		clock-names	= "thermal";

		clocks		= <&clk_m_mpethsens>;

		interrupts	= <GIC_SPI 23 IRQ_TYPE_NONE>;

	};

drivers/thermal/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL 


config DOVE_THERMAL

	tristate "Temperature sensor on Marvell Dove SoCs"

	depends on ARCH_DOVE

	depends on ARCH_DOVE || MACH_DOVE

	depends on OF

	help

	  Support for the Dove thermal sensor driver in the Linux thermal
@@ -243,4 +243,9 @@ depends on ARCH_EXYNOS 
source "drivers/thermal/samsung/Kconfig"

endmenu



menu "STMicroelectronics thermal drivers"

depends on ARCH_STI && OF

source "drivers/thermal/st/Kconfig"

endmenu



endif

drivers/thermal/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,3 +32,4 @@ obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o 
obj-$(CONFIG_INTEL_SOC_DTS_THERMAL)	+= intel_soc_dts_thermal.o

obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/

obj-$(CONFIG_ACPI_INT3403_THERMAL)	+= int3403_thermal.o

obj-$(CONFIG_ST_THERMAL)	+= st/