• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · baf51c43
    Linus Torvalds authored
    Pull thermal updates from Zhang Rui:
    
     - Implement generic devfreq cooling mechanism through frequency
       reduction for devices using devfreq.  From Ørjan Eide and Javi
       Merino.
    
     - Introduce OMAP3 support on TI SoC thermal driver.  From Pavel Mack
       and Eduardo Valentin.
    
     - A bounch of small fixes on devfreq_cooling, Exynos, IMX, Armada, and
       Rockchip thermal drivers.
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (24 commits)
      thermal: exynos: Directly return 0 instead of using local ret variable
      thermal: exynos: Remove unneeded semicolon
      thermal: exynos: Use IS_ERR() because regulator cannot be NULL
      thermal: exynos: Fix first temperature read after registering sensor
      thermal: exynos: Fix unbalanced regulator disable on probe failure
      devfreq_cooling: return on allocation failure
      thermal: rockchip: support the sleep pinctrl state to avoid glitches in s2r
      dt-bindings: rockchip-thermal: Add the pinctrl states in this document
      thermal: devfreq_cooling: Make power a u64
      thermal: devfreq_cooling: use a thermal_cooling_device for register and unregister
      thermal: underflow bug in imx_set_trip_temp()
      thermal: armada: Fix possible overflow in the Armada 380 thermal sensor formula
      thermal: imx: register irq handler later in probe
      thermal: rockhip: fix setting thermal shutdown polarity
      thermal: rockchip: fix handling of invalid readings
      devfreq_cooling: add trace information
      thermal: Add devfreq cooling
      PM / OPP: get the voltage for all OPPs
      tools/thermal: tmon: use pkg-config also for CFLAGS
      linux/thermal.h: rename KELVIN_TO_CELSIUS to DECI_KELVIN_TO_CELSIUS
      ...
    baf51c43
core.c 37.2 KB