Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

Pull thermal SoC updates from Eduardo Valentin:

 - Tegra DT binding documentation for Tegra194

 - Armada now supports ap806 and cp110

 - RCAR thermal now supports R8A774C0 and R8A77990

 - Fixes on thermal_hwmon, IMX, generic-ADC, ST, RCAR, Broadcom,
   Uniphier, QCOM, Tegra, PowerClamp, and Armada thermal drivers.

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (22 commits)
  thermal: generic-adc: Fix adc to temp interpolation
  thermal: rcar_thermal: add R8A77990 support
  dt-bindings: thermal: rcar-thermal: add R8A77990 support
  thermal: rcar_thermal: add R8A774C0 support
  dt-bindings: thermal: rcar-thermal: add R8A774C0 support
  dt-bindings: cp110: document the thermal interrupt capabilities
  dt-bindings: ap806: document the thermal interrupt capabilities
  MAINTAINERS: thermal: add entry for Marvell MVEBU thermal driver
  thermal: armada: add overheat interrupt support
  thermal: st: fix Makefile typo
  thermal: uniphier: Convert to SPDX identifier
  thermal/intel_powerclamp: Change to use DEFINE_SHOW_ATTRIBUTE macro
  thermal: tegra: soctherm: Change to use DEFINE_SHOW_ATTRIBUTE macro
  dt-bindings: thermal: tegra-bpmp: Add Tegra194 support
  thermal: imx: save one condition block for normal case of nvmem initialization
  thermal: imx: fix for dependency on cpu-freq
  thermal: tsens: qcom: do not create duplicate regmap debugfs entries
  thermal: armada: Use PTR_ERR_OR_ZERO in armada_thermal_probe_legacy()
  dt-bindings: thermal: rcar-gen3-thermal: All variants use 3 interrupts
  thermal: broadcom: use devm_thermal_zone_of_sensor_register
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/thermal/Kconfig
Simple merge

diff --cc drivers/thermal/armada_thermal.c
index d7105d01859ab086de87482535019408ae15c818,df3054b0ae6b6d122fd48e0c7e79bb639d82fe7b..53129de59dd92b466937fa2ce767bd4dab16a039
--- 1/drivers/thermal/armada_thermal.c
--- 2/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@@ -530,23 -740,9 +727,20 @@@ static int armada_thermal_probe_legacy(
        if (IS_ERR(base))
                return PTR_ERR(base);
  
 +      /*
 +       * Fix up from the old individual DT register specification to
 +       * cover all the registers.  We do this by adjusting the ioremap()
 +       * result, which should be fine as ioremap() deals with pages.
 +       * However, validate that we do not cross a page boundary while
 +       * making this adjustment.
 +       */
 +      if (((unsigned long)base & ~PAGE_MASK) < data->syscon_status_off)
 +              return -EINVAL;
 +      base -= data->syscon_status_off;
 +
        priv->syscon = devm_regmap_init_mmio(&pdev->dev, base,
                                             &armada_thermal_regmap_config);
-       if (IS_ERR(priv->syscon))
-               return PTR_ERR(priv->syscon);
- 
-       return 0;
+       return PTR_ERR_OR_ZERO(priv->syscon);
  }
  
  static int armada_thermal_probe_syscon(struct platform_device *pdev,

diff --cc drivers/thermal/broadcom/bcm2835_thermal.c
Simple merge

diff --cc drivers/thermal/broadcom/brcmstb_thermal.c
Simple merge