Pull thermal updates from Daniel Lezcano: - Depromote debug print on the db8500 platform (Linus Walleij) - Fix compilation warning when compiling with make W=1 (Amit Kucheria) - Code cleanup and refactoring, regmap conversion and add hwmon support on Qoriq (Andrey Smirnov) - Add an idle injection cpu cooling device and its documentation, rename the cpu_cooling device to cpufreq_cooling device (Daniel Lezcano) - Convert unexported functions to static, add the __init annotation in the thermal-of code and remove the pointless wrapper functions (Daniel Lezcano) - Fix register offset for Armada XP and register reset bit initialization (Zak Hays) - Enable hwmon on the rockchip (Stefan Schaeckeler) - Add the thermal sensor for the H6/H5/H3/A64/A83T/R40 sun8i platform and their device tree bindings, followed by a fix for the ths number and the sparse warnings (Yangtao Li) - Code cleansup for the sun8i and hwmon support (Yangtao Li) - Silent some messages which are misleading given the changes made in the previous version on generic-adc (Martin Blumenstingl) - Rename exynos to Exynos (Krzysztof Kozlowski) - Add the bcm2711 thermal driver with the device tree bindings (Stefan Wahren) - Use usleep_range() instead of udelay() as the call is always done in a sleep-able context (Geert Uytterhoeven) - Do code cleanup and re-organization to set the scene for a new process for the brcmstb (Florian Fainelli) - Fix bindings check issues on brcm (Stefan Wahren) - Add Jasper Lake support on int340x (Nivedita Swaminathan) - Add Comet Lake support on intel pch (Gayatri Kammela) - Fix unmatched pci_release_region() on x86 (Chuhong Yuan) - Remove temperature boundaries for rcar and rcar3 (Niklas Söderlund) - Fix return value to -ENODEV when thermal_zone_of_sensor_register() is called with the of-node is missing (Peter Mamonov) - Code cleanup, interrupt bouncing, and better support on stm32 (Pascal Paillet) * tag 'thermal-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (66 commits) thermal: stm32: Fix low threshold interrupt flood thermal: stm32: Improve temperature computing thermal: stm32: Handle multiple trip points thermal: stm32: Disable interrupts at probe thermal: stm32: Rework sensor mode management thermal: stm32: Fix icifr register name thermal: of: Make thermal_zone_of_sensor_register return -ENODEV if a sensor OF node is missing thermal: rcar_gen3_thermal: Remove temperature bound thermal: rcar_thermal: Remove temperature bound thermal: intel: intel_pch_thermal: Add Comet Lake (CML) platform support thermal: intel: Fix unmatched pci_release_region thermal: int340x: processor_thermal: Add Jasper Lake support dt-bindings: brcm,avs-ro-thermal: Fix binding check issues thermal: brcmstb_thermal: Register different ops per process thermal: brcmstb_thermal: Restructure interrupt registration thermal: brcmstb_thermal: Add 16nm process thermal parameters dt-bindings: thermal: Define BCM7216 thermal sensor compatible thermal: brcmstb_thermal: Prepare to support a different process thermal: brcmstb_thermal: Do not use DT coefficients thermal: rcar_thermal: Use usleep_range() instead of udelay() ...
Showing the changes to include/linux (2 of 48 files). Show all
Unified · Split
| @@ -7,7 +7,7 @@ · 6 unmodified lines | ||
| 7 | 7 | * Copyright (C) 2013 Texas Instruments Inc. |
| 8 | 8 | * Contact: Eduardo Valentin <eduardo.valentin@ti.com> |
| 9 | 9 | * |
| 10 | − * Highly based on cpu_cooling.c. | |
| 10 | + * Highly based on cpufreq_cooling.c. | |
| 11 | 11 | * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) |
| 12 | 12 | * Copyright (C) 2012 Amit Daniel <amit.kachhap@linaro.org> |
| 13 | 13 | */ |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | |
| 20 | 20 | struct cpufreq_policy; |
| 21 | 21 | |
| 22 | −#ifdef CONFIG_CPU_THERMAL | |
| 22 | +#ifdef CONFIG_CPU_FREQ_THERMAL | |
| 23 | 23 | /** |
| 24 | 24 | * cpufreq_cooling_register - function to create cpufreq cooling device. |
| 25 | 25 | * @policy: cpufreq policy. |
| @@ -40,7 +40,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); · 14 unmodified lines | ||
| 40 | 40 | struct thermal_cooling_device * |
| 41 | 41 | of_cpufreq_cooling_register(struct cpufreq_policy *policy); |
| 42 | 42 | |
| 43 | −#else /* !CONFIG_CPU_THERMAL */ | |
| 43 | +#else /* !CONFIG_CPU_FREQ_THERMAL */ | |
| 44 | 44 | static inline struct thermal_cooling_device * |
| 45 | 45 | cpufreq_cooling_register(struct cpufreq_policy *policy) |
| 46 | 46 | { |
| @@ -58,6 +58,24 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) · 11 unmodified lines | ||
| 58 | 58 | { |
| 59 | 59 | return NULL; |
| 60 | 60 | } |
| 61 | −#endif /* CONFIG_CPU_THERMAL */ | |
| 61 | +#endif /* CONFIG_CPU_FREQ_THERMAL */ | |
| 62 | + | |
| 63 | +struct cpuidle_driver; | |
| 64 | + | |
| 65 | +#ifdef CONFIG_CPU_IDLE_THERMAL | |
| 66 | +int cpuidle_cooling_register(struct cpuidle_driver *drv); | |
| 67 | +int cpuidle_of_cooling_register(struct device_node *np, | |
| 68 | + struct cpuidle_driver *drv); | |
| 69 | +#else /* CONFIG_CPU_IDLE_THERMAL */ | |
| 70 | +static inline int cpuidle_cooling_register(struct cpuidle_driver *drv) | |
| 71 | +{ | |
| 72 | + return 0; | |
| 73 | +} | |
| 74 | +static inline int cpuidle_of_cooling_register(struct device_node *np, | |
| 75 | + struct cpuidle_driver *drv) | |
| 76 | +{ | |
| 77 | + return 0; | |
| 78 | +} | |
| 79 | +#endif /* CONFIG_CPU_IDLE_THERMAL */ | |
| 62 | 80 | |
| 63 | 81 | #endif /* __CPU_COOLING_H__ */ |