Commit 8cbd0eefcaf8cc32ded2bf229f0fc379b2ad69f2
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui: "There are not too many changes this time, except two new platform thermal drivers, ti-soc-thermal driver and x86_pkg_temp_thermal driver, and a couple of small fixes. Highlights: - move the ti-soc-thermal driver out of the staging tree to the thermal tree. - introduce the x86_pkg_temp_thermal driver. This driver registers CPU digital temperature package level sensor as a thermal zone. - small fixes/cleanups including removing redundant use of platform_set_drvdata() and of_match_ptr for all platform thermal drivers" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits) thermal: cpu_cooling: fix stub function thermal: ti-soc-thermal: use standard GPIO DT bindings thermal: MAINTAINERS: Add git tree path for SoC specific updates thermal: fix x86_pkg_temp_thermal.c build and Kconfig Thermal: Documentation for x86 package temperature thermal driver Thermal: CPU Package temperature thermal thermal: consider emul_temperature while computing trend thermal: ti-soc-thermal: add DT example for DRA752 chip thermal: ti-soc-thermal: add dra752 chip to device table thermal: ti-soc-thermal: add thermal data for DRA752 chips thermal: ti-soc-thermal: remove usage of IS_ERR_OR_NULL thermal: ti-soc-thermal: freeze FSM while computing trend thermal: ti-soc-thermal: remove external heat while extrapolating hotspot thermal: ti-soc-thermal: update DT reference for OMAP5430 x86, mcheck, therm_throt: Process package thresholds thermal: cpu_cooling: fix 'descend' check in get_property() Thermal: spear: Remove redundant use of of_match_ptr Thermal: kirkwood: Remove redundant use of of_match_ptr Thermal: dove: Remove redundant use of of_match_ptr Thermal: armada: Remove redundant use of of_match_ptr ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 44 changed files Side-by-side Diff
- Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
- Documentation/thermal/x86_pkg_temperature_thermal
- MAINTAINERS
- arch/x86/include/asm/mce.h
- arch/x86/kernel/cpu/mcheck/therm_throt.c
- drivers/staging/Kconfig
- drivers/staging/Makefile
- drivers/staging/ti-soc-thermal/Kconfig
- drivers/staging/ti-soc-thermal/Makefile
- drivers/staging/ti-soc-thermal/TODO
- drivers/staging/ti-soc-thermal/omap4-thermal-data.c
- drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h
- drivers/staging/ti-soc-thermal/omap5-thermal-data.c
- drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h
- drivers/staging/ti-soc-thermal/ti-bandgap.c
- drivers/staging/ti-soc-thermal/ti-bandgap.h
- drivers/staging/ti-soc-thermal/ti-thermal-common.c
- drivers/staging/ti-soc-thermal/ti-thermal.h
- drivers/staging/ti-soc-thermal/ti_soc_thermal.txt
- drivers/thermal/Kconfig
- drivers/thermal/Makefile
- drivers/thermal/armada_thermal.c
- drivers/thermal/cpu_cooling.c
- drivers/thermal/dove_thermal.c
- drivers/thermal/exynos_thermal.c
- drivers/thermal/kirkwood_thermal.c
- drivers/thermal/rcar_thermal.c
- drivers/thermal/spear_thermal.c
- drivers/thermal/thermal_core.c
- drivers/thermal/ti-soc-thermal/Kconfig
- drivers/thermal/ti-soc-thermal/Makefile
- drivers/thermal/ti-soc-thermal/TODO
- drivers/thermal/ti-soc-thermal/dra752-bandgap.h
- drivers/thermal/ti-soc-thermal/dra752-thermal-data.c
- drivers/thermal/ti-soc-thermal/omap4-thermal-data.c
- drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h
- drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
- drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
- drivers/thermal/ti-soc-thermal/ti-bandgap.c
- drivers/thermal/ti-soc-thermal/ti-bandgap.h
- drivers/thermal/ti-soc-thermal/ti-thermal-common.c
- drivers/thermal/ti-soc-thermal/ti-thermal.h
- drivers/thermal/x86_pkg_temp_thermal.c
- include/linux/cpu_cooling.h