Commit 3bc5ed15 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'thermal-v6.12-rc1' of... 

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

Merge thermal drivers changes for v6.12-rc1 from Daniel Lezcano:

"- Add power domain DT bindings for new Amlogic SoCs (Georges Stark)

 - Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() in the ST
   driver and add a Kconfig dependency on THERMAL_OF subsystem for the
   STi driver (Raphael Gallais-Pou)

 - Simplify with dev_err_probe() the error code path in the probe
   functions for the brcmstb driver (Yan Zhen)

 - Remove trailing space after \n newline in the Renesas driver (Colin
   Ian King)

 - Add DT binding compatible string for the SA8255p with the tsens
   driver (Nikunj Kela)

 - Use the devm_clk_get_enabled() helpers to simplify the init routine
   in the sprd driver (Huan Yang)

 - Remove __maybe_unused notations for the functions by using the new
   RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() macros on the IMx and
   Qoriq drivers (Fabio Estevam)

 - Remove unused declarations in the header file as the functions were
   removed in a previous change on the ti-soc-thermal driver (Zhang
   Zekun)

 - Simplify with dev_err_probe()	the error code path in the probe
   functions for the imx_sc_thermal driver (Alexander Stein)"

* tag 'thermal-v6.12-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/imx_sc_thermal: Use dev_err_probe
  thermal/drivers/ti-soc-thermal: Remove unused declarations
  thermal/drivers/imx: Remove __maybe_unused notations
  thermal/drivers/qoriq: Remove __maybe_unused notations
  thermal/drivers/sprd: Use devm_clk_get_enabled() helpers
  dt-bindings: thermal: tsens: document support on SA8255p
  thermal/drivers/renesas: Remove trailing space after \n newline
  thermal/drivers/brcmstb_thermal: Simplify with dev_err_probe()
  thermal/drivers/sti: Depend on THERMAL_OF subsystem
  thermal/drivers/st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
  dt-bindings: thermal: amlogic,thermal: add optional power-domains
parents e3ee4ab0 7d8abc5f

Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ properties: 
  clocks:

    maxItems: 1



  power-domains:

    maxItems: 1



  amlogic,ao-secure:

    description: phandle to the ao-secure syscon

    $ref: /schemas/types.yaml#/definitions/phandle

Documentation/devicetree/bindings/thermal/qcom-tsens.yaml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ properties: 
              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

              - qcom,qcm2290-tsens

              - qcom,sa8255p-tsens

              - qcom,sa8775p-tsens

              - qcom,sc7180-tsens

              - qcom,sc7280-tsens

drivers/thermal/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ source "drivers/thermal/samsung/Kconfig" 
endmenu



menu "STMicroelectronics thermal drivers"

depends on (ARCH_STI || ARCH_STM32) && OF

depends on (ARCH_STI || ARCH_STM32) && THERMAL_OF

source "drivers/thermal/st/Kconfig"

endmenu

drivers/thermal/broadcom/brcmstb_thermal.c

+6 −9
Original line number Diff line number Diff line
@@ -338,11 +338,9 @@ static int brcmstb_thermal_probe(struct platform_device *pdev) 


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

						of_ops);

	if (IS_ERR(thermal)) {

		ret = PTR_ERR(thermal);

		dev_err(&pdev->dev, "could not register sensor: %d\n", ret);

		return ret;

	}

	if (IS_ERR(thermal))

		return dev_err_probe(&pdev->dev, PTR_ERR(thermal),

					"could not register sensor\n");



	priv->thermal = thermal;
@@ -352,10 +350,9 @@ static int brcmstb_thermal_probe(struct platform_device *pdev) 
						brcmstb_tmon_irq_thread,

						IRQF_ONESHOT,

						DRV_NAME, priv);

		if (ret < 0) {

			dev_err(&pdev->dev, "could not request IRQ: %d\n", ret);

			return ret;

		}

		if (ret < 0)

			return dev_err_probe(&pdev->dev, ret,

						"could not request IRQ\n");

	}



	dev_info(&pdev->dev, "registered AVS TMON of-sensor driver\n");

drivers/thermal/imx_sc_thermal.c

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev) 
			if (ret == -ENODEV)

				continue;



			dev_err(&pdev->dev, "failed to register thermal zone\n");

			return ret;

			return dev_err_probe(&pdev->dev, ret, "failed to register thermal zone\n");

		}



		devm_thermal_add_hwmon_sysfs(&pdev->dev, sensor->tzd);