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

Commit 19785cf9 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 Zhang Rui:
 "Thermal SoC management updates:

   - imx thermal driver now supports i.MX7 thermal sensor (Anson Huang)

   - exynos thermal driver dropped support for exynos 5440 (Krzysztof
     Kozlowski)

   - rcar_thermal now supports r8a77995 (Yoshihiro Kaneko)

   - rcar_gen3_thermal now supports r8a77965 (Niklas Söderlund)

   - qcom-spmi-temp-alarm now supports GEN2 PMIC peripherals (David
     Collins)

   - uniphier thermal now supports UniPhier PXs3 (Kunihiko Hayashi)

   - mediatek thermal now supports MT7622 SoC (Sean Wang)

   - considerable refactoring of exynos driver (Bartlomiej
     Zolnierkiewicz)

   - small fixes all over the place on different drivers"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (50 commits)
  thermal: qcom: tsens: Allow number of sensors to come from DT
  thermal: tegra: soctherm: add const to struct thermal_cooling_device_ops
  thermal: exynos: Reduce severity of too early temperature read
  thermal: imx: Switch to SPDX identifier
  thermal: qcom-spmi-temp-alarm: add support for GEN2 PMIC peripherals
  thermal: ti-soc-thermal: fix incorrect entry in omap5430_adc_to_temp[]
  thermal: rcar_thermal: add r8a77995 support
  dt-bindings: thermal: rcar-thermal: add R8A77995 support
  thermal: mediatek: use of_device_get_match_data()
  thermal: exynos: remove trip reporting to user-space
  thermal: exynos: remove unused defines for Exynos5433
  thermal: exynos: cleanup code for enabling threshold interrupts
  thermal: exynos: check return values of ->get_trip_[temp, hyst] methods
  thermal: exynos: move trips setting to exynos_tmu_initialize()
  thermal: exynos: set trips in ascending order in exynos7_tmu_initialize()
  thermal: exynos: do not use trips structure directly in ->tmu_initialize
  thermal: exynos: add exynos*_tmu_set_[trip,hyst]() helpers
  thermal: exynos: move IRQs clearing to exynos_tmu_initialize()
  thermal: exynos: clear IRQs later in exynos4412_tmu_initialize()
  thermal: exynos: make ->tmu_initialize method void
  ...
parents 98db5e55 6d7c70d1

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

+1 −13
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 
	       "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4

	       "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4

			Exynos5420 (Must pass triminfo base and triminfo clock)

			Exynos5420 (Must pass triminfo base and triminfo clock)

               "samsung,exynos5433-tmu"

               "samsung,exynos5433-tmu"

	       "samsung,exynos5440-tmu"

	       "samsung,exynos7-tmu"

	       "samsung,exynos7-tmu"

- interrupt-parent : The phandle for the interrupt controller

- interrupt-parent : The phandle for the interrupt controller

- reg : Address range of the thermal registers. For soc's which has multiple

- reg : Address range of the thermal registers. For soc's which has multiple
@@ -68,18 +67,7 @@ Example 1): 
		#thermal-sensor-cells = <0>;

		#thermal-sensor-cells = <0>;

	};

	};





Example 2):

Example 2): (In case of Exynos5420 "with misplaced TRIMINFO register")



	tmuctrl_0: tmuctrl@160118 {

		compatible = "samsung,exynos5440-tmu";

		reg = <0x160118 0x230>, <0x160368 0x10>;

		interrupts = <0 58 0>;

		clocks = <&clock 21>;

		clock-names = "tmu_apbif";

		#thermal-sensor-cells = <0>;

	};



Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")

	tmu_cpu2: tmu@10068000 {

	tmu_cpu2: tmu@10068000 {

		compatible = "samsung,exynos5420-tmu-ext-triminfo";

		compatible = "samsung,exynos5420-tmu-ext-triminfo";

		reg = <0x10068000 0x100>, <0x1006c000 0x4>;

		reg = <0x10068000 0x100>, <0x1006c000 0x4>;

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

+7 −2
Original line number Original line Diff line number Diff line 
* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs

* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs





Required properties:

Required properties:

- compatible : "fsl,imx6q-tempmon" for i.MX6Q, "fsl,imx6sx-tempmon" for i.MX6SX.

- compatible : must be one of following:

  i.MX6SX has two more IRQs than i.MX6Q, one is IRQ_LOW and the other is IRQ_PANIC,

  - "fsl,imx6q-tempmon" for i.MX6Q,

  - "fsl,imx6sx-tempmon" for i.MX6SX,

  - "fsl,imx7d-tempmon" for i.MX7S/D.

- interrupts : the interrupt output of the controller:

  i.MX6Q has one IRQ which will be triggered when temperature is higher than high threshold,

  i.MX6SX and i.MX7S/D have two more IRQs than i.MX6Q, one is IRQ_LOW and the other is IRQ_PANIC,

  when temperature is below than low threshold, IRQ_LOW will be triggered, when temperature

  when temperature is below than low threshold, IRQ_LOW will be triggered, when temperature

  is higher than panic threshold, system will auto reboot by SRC module.

  is higher than panic threshold, system will auto reboot by SRC module.

- fsl,tempmon : phandle pointer to system controller that contains TEMPMON

- fsl,tempmon : phandle pointer to system controller that contains TEMPMON

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
  - "mediatek,mt8173-thermal" : For MT8173 family of SoCs

  - "mediatek,mt8173-thermal" : For MT8173 family of SoCs

  - "mediatek,mt2701-thermal" : For MT2701 family of SoCs

  - "mediatek,mt2701-thermal" : For MT2701 family of SoCs

  - "mediatek,mt2712-thermal" : For MT2712 family of SoCs

  - "mediatek,mt2712-thermal" : For MT2712 family of SoCs

  - "mediatek,mt7622-thermal" : For MT7622 SoC

- reg: Address range of the thermal controller

- reg: Address range of the thermal controller

- interrupts: IRQ for the thermal controller

- interrupts: IRQ for the thermal controller

- clocks, clock-names: Clocks needed for the thermal controller. required

- clocks, clock-names: Clocks needed for the thermal controller. required

Documentation/devicetree/bindings/thermal/qcom-tsens.txt

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




- reg: Address range of the thermal registers

- reg: Address range of the thermal registers

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

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

- #qcom,sensors: Number of sensors in tsens block

- Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify

- Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify

nvmem cells

nvmem cells

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
			  Examples with soctypes are:

			  Examples with soctypes are:

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

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

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

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

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

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

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

			  needs one address range. Sorting must be done in

			  needs one address range. Sorting must be done in

			  increasing order according to datasheet, i.e.

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




Optional properties:

Optional properties:





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

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

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

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

			  property is mandatory if the thermal sensor instance

			  property is mandatory if the thermal sensor instance

			  is part of a controllable power domain.

			  is part of a controllable power domain.