• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 8cbd0eef
    Linus Torvalds authored
    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
      ...
    8cbd0eef
therm_throt.c 15.9 KB