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

Commit 1e032393 authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next

parents 023b7b07 501a5c71 6ed5ed14 fe9ba5bc

Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
* Broadcom STB thermal management



Thermal management core, provided by the AVS TMON hardware block.



Required properties:

- compatible: must be "brcm,avs-tmon" and/or "brcm,avs-tmon-bcm7445"

- reg: address range for the AVS TMON registers

- interrupts: temperature monitor interrupt, for high/low threshold triggers

- interrupt-names: should be "tmon"

- interrupt-parent: the parent interrupt controller



Example:



	thermal@f04d1500 {

		compatible = "brcm,avs-tmon-bcm7445", "brcm,avs-tmon";

		reg = <0xf04d1500 0x28>;

		interrupts = <0x6>;

		interrupt-names = "tmon";

		interrupt-parent = <&avs_host_l2_intc>;

	};

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -7,10 +7,17 @@ Required properties: 
  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

  control registers, e.g. ANATOP on imx6q.

  control registers, e.g. ANATOP on imx6q.

- nvmem-cells: A phandle to the calibration cells provided by ocotp.

- nvmem-cell-names: Should be "calib", "temp_grade".



Deprecated properties:

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

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

  calibration data, e.g. OCOTP on imx6q.  The details about calibration data

  calibration data, e.g. OCOTP on imx6q.  The details about calibration data

  can be found in SoC Reference Manual.

  can be found in SoC Reference Manual.





Direct access to OCOTP via fsl,tempmon-data is incorrect on some newer chips

because it does not handle OCOTP clock requirements.



Optional properties:

Optional properties:

- clocks : thermal sensor's clock source.

- clocks : thermal sensor's clock source.

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 




Required properties:

Required properties:

- compatible : should be "rockchip,<name>-tsadc"

- compatible : should be "rockchip,<name>-tsadc"

   "rockchip,rv1108-tsadc": found on RV1108 SoCs

   "rockchip,rk3228-tsadc": found on RK3228 SoCs

   "rockchip,rk3228-tsadc": found on RK3228 SoCs

   "rockchip,rk3288-tsadc": found on RK3288 SoCs

   "rockchip,rk3288-tsadc": found on RK3288 SoCs

   "rockchip,rk3328-tsadc": found on RK3328 SoCs

   "rockchip,rk3328-tsadc": found on RK3328 SoCs

MAINTAINERS

+8 −0
Original line number Original line Diff line number Diff line
@@ -2955,6 +2955,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt

F:	Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt

F:	drivers/cpufreq/brcmstb*

F:	drivers/cpufreq/brcmstb*





BROADCOM STB AVS TMON DRIVER

M:	Markus Mayer <mmayer@broadcom.com>

M:	bcm-kernel-feedback-list@broadcom.com

L:	linux-pm@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt

F:	drivers/thermal/broadcom/brcmstb*



BROADCOM STB NAND FLASH DRIVER

BROADCOM STB NAND FLASH DRIVER

M:	Brian Norris <computersforpeace@gmail.com>

M:	Brian Norris <computersforpeace@gmail.com>

M:	Kamal Dasu <kdasu.kdev@gmail.com>

M:	Kamal Dasu <kdasu.kdev@gmail.com>

drivers/thermal/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -206,6 +206,7 @@ config HISI_THERMAL 
config IMX_THERMAL

config IMX_THERMAL

	tristate "Temperature sensor driver for Freescale i.MX SoCs"

	tristate "Temperature sensor driver for Freescale i.MX SoCs"

	depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST

	depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST

	depends on NVMEM || !NVMEM

	depends on MFD_SYSCON

	depends on MFD_SYSCON

	depends on OF

	depends on OF

	help

	help
@@ -408,7 +409,7 @@ config MTK_THERMAL 
	  controller present in Mediatek SoCs

	  controller present in Mediatek SoCs





menu "Broadcom thermal drivers"

menu "Broadcom thermal drivers"

depends on ARCH_BCM || COMPILE_TEST

depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST

source "drivers/thermal/broadcom/Kconfig"

source "drivers/thermal/broadcom/Kconfig"

endmenu

endmenu