Commit eb78332b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more thermal control updates from Rafael Wysocki:
 "These update a few thermal drivers used on ARM platforms and thermal
  tools:

   - Add SAR2130P compatible to DT bindings in the QCom Tsens driver
     (Dmitry Baryshkov)

   - Add static annotation to arrays describing platform sensors in the
     LVTS Mediatek driver (Colin Ian King)

   - Switch back to struct platform_driver::remove() from the previous
     callbacks prototype rework (Uwe Kleine-König)

   - Add MSM8937 compatible to DT bindings and its support in the QCom
     Tsens driver (Barnabás Czémán)

   - Remove a pointless sign test on an unsigned value in
     k3_bgp_read_temp() in the k3_j72xx_bandgap driver (Rex Nie)

   - Fix a pointer reference loss when realloc() fails in the thermal
     library (Zhang Jiao)"

* tag 'thermal-6.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  tools/thermal: Fix common realloc mistake
  thermal/drivers/k3_j72xx_bandgap: Simplify code in k3_bgp_read_temp()
  thermal/drivers/qcom/tsens-v1: Add support for MSM8937 tsens
  dt-bindings: thermal: tsens: Add MSM8937
  thermal: Switch back to struct platform_driver::remove()
  thermal/drivers/mediatek/lvts_thermal: Make read-only arrays static const
  dt-bindings: thermal: qcom-tsens: Add SAR2130P compatible
parents 6f9baa9b fef664fd

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ properties: 
      - description: v1 of TSENS

        items:

          - enum:

              - qcom,msm8937-tsens

              - qcom,msm8956-tsens

              - qcom,msm8976-tsens

              - qcom,qcs404-tsens
@@ -53,6 +54,7 @@ properties: 
              - qcom,qcm2290-tsens

              - qcom,sa8255p-tsens

              - qcom,sa8775p-tsens

              - qcom,sar2130p-tsens

              - qcom,sc7180-tsens

              - qcom,sc7280-tsens

              - qcom,sc8180x-tsens

drivers/thermal/amlogic_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static struct platform_driver amlogic_thermal_driver = { 
		.of_match_table = of_amlogic_thermal_match,

	},

	.probe = amlogic_thermal_probe,

	.remove_new = amlogic_thermal_remove,

	.remove = amlogic_thermal_remove,

};



module_platform_driver(amlogic_thermal_driver);

drivers/thermal/armada_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ static void armada_thermal_exit(struct platform_device *pdev) 


static struct platform_driver armada_thermal_driver = {

	.probe = armada_thermal_probe,

	.remove_new = armada_thermal_exit,

	.remove = armada_thermal_exit,

	.driver = {

		.name = "armada_thermal",

		.of_match_table = armada_thermal_id_table,

drivers/thermal/broadcom/bcm2835_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void bcm2835_thermal_remove(struct platform_device *pdev) 


static struct platform_driver bcm2835_thermal_driver = {

	.probe = bcm2835_thermal_probe,

	.remove_new = bcm2835_thermal_remove,

	.remove = bcm2835_thermal_remove,

	.driver = {

		.name = "bcm2835_thermal",

		.of_match_table = bcm2835_thermal_of_match_table,

drivers/thermal/broadcom/ns-thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ MODULE_DEVICE_TABLE(of, ns_thermal_of_match); 


static struct platform_driver ns_thermal_driver = {

	.probe		= ns_thermal_probe,

	.remove_new	= ns_thermal_remove,

	.remove		= ns_thermal_remove,

	.driver = {

		.name = "ns-thermal",

		.of_match_table = ns_thermal_of_match,