Skip to content
  • Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 544a068f
    Linus Torvalds authored
    Pull thermal management updates from Zhang Rui:
    
     - add thermal driver for R-Car Gen3 thermal sensors.
    
     - add thermal driver for ZTE' zx2967 family thermal sensors.
    
     - convert thermal ID allocation from IDR to IDA.
    
     - fix a possible NULL dereference in imx thermal driver.
    
     - fix a ti-soc-thermal driver dependency issue so that critical thermal
       control is still available when CPU_THERMAL is not defined.
    
     - update binding information for QorIQ thermal driver.
    
     - a couple of cleanups in thermal core, intel_powerclamp, exynos,
       dra752-thermal, mtk-thermal driver.
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
      powerpc/mpc85xx: Update TMU device tree node for T1023/T1024
      powerpc/mpc85xx: Update TMU device tree node for T1040/T1042
      dt-bindings: Update QorIQ TMU thermal bindings
      thermal: mtk_thermal: Staticise a number of data variables
      thermal: arm: dra752: Remove all TSHUT related definitions
      thermal: arm: dra752: Remove TSHUT configuration
      thermal: ti-soc-thermal: Remove CPU_THERMAL Dependency from TI_THERMAL
      thermal: imx: Fix possible NULL dereference.
      thermal: exynos: Remove parsing unused samsung,tmu_cal_mode property
      thermal: zx2967: add thermal driver for ZTE's zx2967 family
      thermal: use cpumask_var_t for on-stack cpu masks
      dt: bindings: add documentation for zx2967 family thermal sensor
      thermal/intel_powerclamp: Remove set-but-not-used variables
      thermal: rcar_gen3_thermal: Add R-Car Gen3 thermal driver
      thermal: rcar_gen3_thermal: Document the R-Car Gen3
      thermal: convert devfreq_cooling to use an IDA
      thermal: convert cpu_cooling to use an IDA
      thermal: convert clock cooling to use an IDA
      thermal core: convert ID allocation to IDA
    544a068f