Skip to content
  • Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · bec04432
    Linus Torvalds authored
    Pull thermal management updates from Zhang Rui:
    
     - introduce brcmstb AVS TMON thermal driver (Brian Norris)
    
     - add Rockchip RV1108 support in rockchip thermal driver (Rocky Hao)
    
     - major rework on HISI driver plus additional support of hisi3660
       (Daniel Lezcano)
    
     - add nvmem-cells binding on imx6sx (Leonard Crestez)
    
     - fix a NULL pointer dereference on ti thermal driver unloading (Tony
       Lindgren)
    
     - improve tmon tool to make it easier to cross-compile tmon (Markus
       Mayer)
    
     - add Coffee Lake and Cannon Lake support for intel processor and pch
       thermal drivers (Srinivas Pandruvada)
    
     - other small fixes and cleanups (Arvind Yadav, Colin Ian King, Allen
       Wild, Nicolin Chen, Baruch SiachNiklas Söderlund, Arnd Bergmann)
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (44 commits)
      thermal: pch: Add Cannon Lake support
      thermal: int340x: processor_thermal: Add Coffee Lake support
      thermal: int340x: processor_thermal: Add Cannon Lake support
      thermal: bxt: remove redundant variable trip
      thermal: cpu_cooling: pr_err() strings should end with newlines
      thermal: add brcmstb AVS TMON driver
      Documentation: devicetree: add binding for Broadcom STB AVS TMON
      thermal/drivers/hisi: Add support for hi3660 SoC
      thermal/drivers/hisi: Prepare to add support for other hisi platforms
      thermal/drivers/hisi: Add platform prefix to function name
      thermal/drivers/hisi: Put platform code together
      thermal/drivers/qcom-spmi: Use devm_iio_channel_get
      thermal/drivers/generic-iio-adc: Switch tz request to devm version
      thermal/drivers/step_wise: Fix temperature regulation misbehavior
      thermal/drivers/hisi: Use round up step value
      thermal/drivers/hisi: Move the clk setup in the corresponding functions
      thermal/drivers/hisi: Remove mutex_lock in the code
      thermal/drivers/hisi: Remove thermal data back pointer
      thermal/drivers/hisi: Convert long to int
      thermal/drivers/hisi: Rename and remove unused field
      ...
    bec04432