Merge tag 'thermal-6.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more thermal control updates from Rafael Wysocki: "These fix assorted issues in the thermal core and ARM thermal drivers. Specifics: - Use platform data to get the sensor ID instead of parsing the device in imx_sc thermal driver and remove the dedicated OF function from the core code (Daniel Lezcano). - Fix Kconfig dependency for the QCom tsens thermal driver (Jonathan Cameron). - Add missing const annotation to the RCar ops thermal driver (Lad Prabhakar). - Drop duplicate parameter check from thermal_zone_device_register_with_trips() (Lad Prabhakar). - Fix NULL pointer dereference in trip_point_temp_store() by making it check if the ->set_trip_temp() operation is present (Lad Prabhakar). - Fix the MSM8939 fourth sensor hardware ID in the QCom tsens thermal driver (Vincent Knecht)" * tag 'thermal-6.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal/drivers/qcom/tsens-v0_1: Fix MSM8939 fourth sensor hw_id thermal/core: Add a check before calling set_trip_temp() thermal/core: Drop valid pointer check for type thermal/drivers/rcar_thermal: Constify static thermal_zone_device_ops thermal/drivers/qcom: Drop false build dependency of all QCOM drivers on QCOM_TSENS thermal/of: Remove the thermal_zone_of_get_sensor_id() function thermal/drivers/imx_sc: Rely on the platform data to get the resource id
Showing
- drivers/thermal/Makefile 1 addition, 1 deletiondrivers/thermal/Makefile
- drivers/thermal/imx_sc_thermal.c 33 additions, 35 deletionsdrivers/thermal/imx_sc_thermal.c
- drivers/thermal/qcom/tsens-v0_1.c 1 addition, 1 deletiondrivers/thermal/qcom/tsens-v0_1.c
- drivers/thermal/rcar_thermal.c 1 addition, 1 deletiondrivers/thermal/rcar_thermal.c
- drivers/thermal/thermal_core.c 1 addition, 1 deletiondrivers/thermal/thermal_core.c
- drivers/thermal/thermal_of.c 0 additions, 44 deletionsdrivers/thermal/thermal_of.c
- drivers/thermal/thermal_sysfs.c 5 additions, 3 deletionsdrivers/thermal/thermal_sysfs.c
- include/linux/thermal.h 0 additions, 10 deletionsinclude/linux/thermal.h
Loading
Please register or sign in to comment