• Linus Torvalds's avatar
    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2af78448
    Linus Torvalds authored
    Pull thermal management updates from Zhang Rui:
     "Highlights:
    
       - introduction of Dove thermal sensor driver.
    
       - introduction of Kirkwood thermal sensor driver.
    
       - introduction of intel_powerclamp thermal cooling device driver.
    
       - add interrupt and DT support for rcar thermal driver.
    
       - add thermal emulation support which allows platform thermal driver
         to do software/hardware emulation for thermal issues."
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
      thermal: rcar: remove __devinitconst
      thermal: return an error on failure to register thermal class
      Thermal: rename thermal governor Kconfig option to avoid generic naming
      thermal: exynos: Use the new thermal trend type for quick cooling action.
      Thermal: exynos: Add support for temperature falling interrupt.
      Thermal: Dove: Add Themal sensor support for Dove.
      thermal: Add support for the thermal sensor on Kirkwood SoCs
      thermal: rcar: add Device Tree support
      thermal: rcar: remove machine_power_off() from rcar_thermal_notify()
      thermal: rcar: add interrupt support
      thermal: rcar: add read/write functions for common/priv data
      thermal: rcar: multi channel support
      thermal: rcar: use mutex lock instead of spin lock
      thermal: rcar: enable CPCTL to use hardware TSC deciding
      thermal: rcar: use parenthesis on macro
      Thermal: fix a build warning when CONFIG_THERMAL_EMULATION cleared
      Thermal: fix a wrong comment
      thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
      PM: intel_powerclamp: off by one in start_power_clamp()
      thermal: exynos: Miscellaneous fixes to support falling threshold interrupt
      ...
    2af78448
thermal_sys.c 46 KB