Merge tag 'thermal-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal...

Pull thermal updates from Daniel Lezcano:

 - Add support to enable/disable the thermal zones resulting on core
   code and drivers cleanup (Andrzej Pietrasiewicz)

 - Add generic netlink support for userspace notifications: events,
   temperature and discovery commands (Daniel Lezcano)

 - Fix redundant initialization for a ret variable (Colin Ian King)

 - Remove the clock cooling code as it is used nowhere (Amit Kucheria)

 - Add the rcar_gen3_thermal's r8a774e1 support (Marian-Cristian
   Rotariu)

 - Replace all references to thermal.txt in the documentation to the
   corresponding yaml files (Amit Kucheria)

 - Add maintainer entry for the IPA (Lukasz Luba)

 - Add support for MSM8939 for the tsens (Shawn Guo)

 - Update power allocator and devfreq cooling to SPDX licensing (Lukasz
   Luba)

 - Add Cannon Lake Low Power PCH support (Sumeet Pawnikar)

 - Add tsensor support for V2 mediatek thermal system (Henry Yen)

 - Fix thermal zone lookup by ID for the core code (Thierry Reding)

* tag 'thermal-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (40 commits)
  thermal: intel: intel_pch_thermal: Add Cannon Lake Low Power PCH support
  thermal: mediatek: Add tsensor support for V2 thermal system
  thermal: mediatek: Prepare to add support for other platforms
  thermal: Update power allocator and devfreq cooling to SPDX licensing
  MAINTAINERS: update entry to thermal governors file name prefixing
  thermal: core: Add thermal zone enable/disable notification
  thermal: qcom: tsens-v0_1: Add support for MSM8939
  dt-bindings: tsens: qcom: Document MSM8939 compatible
  thermal: core: Fix thermal zone lookup by ID
  thermal: int340x: processor_thermal: fix: update Jasper Lake PCI id
  thermal: imx8mm: Support module autoloading
  thermal: ti-soc-thermal: Fix reversed condition in ti_thermal_expose_sensor()
  MAINTAINERS: Add maintenance information for IPA
  thermal: rcar_gen3_thermal: Do not shadow thcode variable
  dt-bindings: thermal: Get rid of thermal.txt and replace references
  thermal: core: Move initialization after core initcall
  thermal: netlink: Improve the initcall ordering
  net: genetlink: Move initialization to core_initcall
  thermal: rcar_gen3_thermal: Add r8a774e1 support
  thermal/drivers/clock_cooling: Remove clock_cooling code
  ...

diff --cc Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
Simple merge

diff --cc Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/platform/x86/acerhdf.c
Simple merge

diff --cc drivers/thermal/imx_thermal.c
Simple merge

diff --cc drivers/thermal/intel/int340x_thermal/int3400_thermal.c
Simple merge

diff --cc drivers/thermal/mtk_thermal.c
index 42c9cd0,88620f7..0bd7aa5
--- 1/drivers/thermal/mtk_thermal.c
--- 2/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@@ -594,11 -649,16 +652,15 @@@ static int mtk_thermal_bank_temperature
        u32 raw;
  
        for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) {
 -              raw = readl(mt->thermal_base +
 -                          conf->msr[conf->bank_data[bank->id].sensors[i]]);
 +              raw = readl(mt->thermal_base + conf->msr[i]);
  
-               temp = raw_to_mcelsius(mt,
-                                      conf->bank_data[bank->id].sensors[i],
-                                      raw);
+               if (mt->conf->version == MTK_THERMAL_V1) {
+                       temp = raw_to_mcelsius_v1(
+                               mt, conf->bank_data[bank->id].sensors[i], raw);
+               } else {
+                       temp = raw_to_mcelsius_v2(
+                               mt, conf->bank_data[bank->id].sensors[i], raw);
+               }
  
                /*
                 * The first read of a sensor often contains very high bogus

diff --cc drivers/thermal/qcom/tsens.c
Simple merge

diff --cc drivers/thermal/rcar_gen3_thermal.c
Simple merge

diff --cc drivers/thermal/sprd_thermal.c
Simple merge

diff --cc net/netlink/genetlink.c
Simple merge