Commit 9580dfb8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'thermal-v6.6-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux 

Merge ARM and related thermal control updates for 6.6-rc1 from Daniel
Lezcano:

"- Check if the Tegra BPMP supports the trip points in order to set the
   .set_trips callback (Mikko Perttunen)

 - Add the new Loongson-2 thermal sensor along with the DT bindings
   (Yinbo Zhu)

 - Use IS_ERR_OR_NULL helper to replace a double test on the TI bandgap
   sensor (Li Zetao)

 - Remove the call to platform_set_drvdata() as there is no call to
   platform_get_drvdata() in a bunch of drivers where that happens
   (Andrei Coardos)

 - Switch the Mediatek LVTS mode to filtered in order to enable the
   interrupts (Nícolas F. R. A. Prado)

 - Fix Wvoid-pointer-to-enum-cast warning on the Exynos TMU (Krzysztof
   Kozlowski)

 - Remove redundant usage of of_match_ptr() as the driver db8500
   already depends on CONFIG_OF (Ruan Jinjie)

 - Remove redundant dev_err_probe() because the underlying function
   already called it in the Mediatek sensor (Chen Jiahao)

 - Free calibration nvmem after reading it on sun8i (Mark Brown)

 - Remove useless comment in the code on sun8i (Yangtao Li)

 - Make tsens_xxxx_nvmem static to fix sparse warning on QCom tsens (Min-Hua Chen)

 - Remove error message at probe deferral on imx8mm (Ahmad Fatoum)

 - Fix parameter check in lvts_debugfs_init with IS_ERR on Mediatek
   LVTS (Minjie Du)

 - Fix the interrupt routine and configuratoin for the Mediatek LVTS
   (Nícolas F. R. A. Prado)"

* tag 'thermal-v6.6-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (27 commits)
  thermal/drivers/tegra-bpmp: Check if BPMP supports trip points
  thermal: dt-bindings: add loongson-2 thermal
  thermal/drivers/loongson-2: Add thermal management support
  thermal/drivers/ti-soc-thermal: Use helper function IS_ERR_OR_NULL()
  thermal/drivers/generic-adc: Removed unneeded call to platform_set_drvdata()
  thermal/drivers/max77620_thermal: Removed unneeded call to platform_set_drvdata()
  thermal/drivers/mediatek/auxadc_thermal: Removed call to platform_set_drvdata()
  thermal/drivers/sun8i_thermal: Remove unneeded call to platform_set_drvdata()
  thermal/drivers/broadcom/brcstb_thermal: Removed unneeded platform_set_drvdata()
  thermal/drivers/mediatek/lvts_thermal: Make readings valid in filtered mode
  thermal/drivers/k3_bandgap: Remove unneeded call to platform_set_drvdata()
  thermal/drivers/k3_j72xx_bandgap: Removed unneeded call to platform_set_drvdata()
  thermal/drivers/broadcom/sr-thermal: Removed call to platform_set_drvdata()
  thermal/drivers/samsung: Fix Wvoid-pointer-to-enum-cast warning
  thermal/drivers/db8500: Remove redundant of_match_ptr()
  thermal/drivers/mediatek: Clean up redundant dev_err_probe()
  thermal/drivers/sun8i: Free calibration nvmem after reading it
  thermal/drivers/sun8i: Remove unneeded comments
  thermal/drivers/tsens: Make tsens_xxxx_nvmem static
  thermal/drivers/imx8mm: Suppress log message on probe deferral
  ...
parents 36534782 1ef5a9f6

Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml

0 → 100644
+44 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/thermal/loongson,ls2k-thermal.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Thermal sensors on Loongson-2 SoCs



maintainers:

  - zhanghongchen <zhanghongchen@loongson.cn>

  - Yinbo Zhu <zhuyinbo@loongson.cn>



properties:

  compatible:

    oneOf:

      - enum:

          - loongson,ls2k1000-thermal

      - items:

          - enum:

              - loongson,ls2k2000-thermal

          - const: loongson,ls2k1000-thermal



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    thermal: thermal-sensor@1fe01500 {

        compatible = "loongson,ls2k1000-thermal";

        reg = <0x1fe01500 0x30>;

        interrupt-parent = <&liointc0>;

        interrupts = <7 IRQ_TYPE_LEVEL_LOW>;

    };

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -12295,6 +12295,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml

F:	drivers/pinctrl/pinctrl-loongson2.c









LOONGSON-2 SOC SERIES THERMAL DRIVER









M:	zhanghongchen <zhanghongchen@loongson.cn>









M:	Yinbo Zhu <zhuyinbo@loongson.cn>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml









F:	drivers/thermal/loongson2_thermal.c

















LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)









M:	Sathya Prakash <sathya.prakash@broadcom.com>









M:	Sreekanth Reddy <sreekanth.reddy@broadcom.com>
































drivers/thermal/Kconfig



+12
−0






























Original line number
Diff line number
Diff line







@@ -510,4 +510,16 @@ config KHADAS_MCU_FAN_THERMAL







	  If you say yes here you get support for the FAN controlled









	  by the Microcontroller found on the Khadas VIM boards.



















config LOONGSON2_THERMAL









	tristate "Loongson-2 SoC series thermal driver"









	depends on LOONGARCH || COMPILE_TEST









	depends on OF









	help









	  Support for Thermal driver found on Loongson-2 SoC series platforms.









	  The thermal driver realizes get_temp and set_trips function, which









	  are used to obtain the temperature of the current node and set the









	  temperature range to trigger the interrupt. When the input temperature









	  is higher than the high temperature threshold or lower than the low









	  temperature threshold, the interrupt will occur.



















endif
























drivers/thermal/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -63,3 +63,4 @@ obj-$(CONFIG_UNIPHIER_THERMAL)	+= uniphier_thermal.o







obj-$(CONFIG_AMLOGIC_THERMAL)     += amlogic_thermal.o









obj-$(CONFIG_SPRD_THERMAL)	+= sprd_thermal.o









obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL)	+= khadas_mcu_fan.o









obj-$(CONFIG_LOONGSON2_THERMAL)	+= loongson2_thermal.o
























drivers/thermal/broadcom/brcmstb_thermal.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -334,7 +334,6 @@ static int brcmstb_thermal_probe(struct platform_device *pdev)







		return PTR_ERR(priv->tmon_base);



















	priv->dev = &pdev->dev;









	platform_set_drvdata(pdev, priv);









	of_ops = priv->temp_params->of_ops;



















	thermal = devm_thermal_of_zone_register(&pdev->dev, 0, priv,