Pull thermal management update from Zhang Rui: "Summary: - of-thermal extension to allow drivers to register and use its functionality in a better way, without exploiting thermal core. From Lukasz Majewski. - Fix a bug in intel_soc_dts_thermal driver which calls a sleep function in interrupt handler. From Maurice Petallo. - add a thermal UAPI header file for exporting the thermal generic netlink information to user-space. From Florian Fainelli. - First round of refactoring in Exynos driver. Bartlomiej and Lukasz are attempting to make it lean and easier to understand. - New thermal driver for Rockchip (rk3288), with support for DT thermal. From Caesar Wang. - New thermal driver for Nvidia, Tegra124 SOCTHERM driver, with support for DT thermal. From Mikko Perttunen. - New cooling device, based on common clock framework. From Eduardo Valentin. - a couple of small fixes in thermal core framework. From Srinivas Pandruvada, Javi Merino, Luis Henriques. - Dropping Armada A375-Z1 SoC thermal support as the chip is not in the market, armada folks decided to drop its support. - a couple of small fixes and cleanups in int340x thermal driver" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (58 commits) thermal: provide an UAPI header file Thermal/int340x: Clear the error value of the last acpi_bus_get_device() call thermal/powerclamp: add id for braswell cpu thermal: Intel SoC DTS: Don't do thermal zone update inside spin_lock Thermal: fix platform_no_drv_owner.cocci warnings Thermal/int340x: avoid unnecessary pointer casting thermal: int3403: Delete a check before thermal_zone_device_unregister() thermal/int3400: export uuids thermal: of: Extend current of-thermal.c code to allow setting emulated temp thermal: of: Extend of-thermal to export table of trip points thermal: of: Rename struct __thermal_trip to struct thermal_trip thermal: of: Extend of-thermal.c to provide check if trip point is valid thermal: of: Extend of-thermal.c to provide number of trip points thermal: Fix error path in thermal_init() thermal: lock the thermal zone when switching governors thermal: core: ignore invalid trip temperature thermal: armada: Remove support for A375-Z1 SoC thermal: rockchip: add driver for thermal dt-bindings: document Rockchip thermal thermal: exynos: remove exynos_tmu_data.h include ...
Showing the changes to include/uapi/linux (2 of 34 files). Show all
Unified · Split
| @@ -387,6 +387,7 @@ header-y += tcp.h · 386 unmodified lines | |||
| 387 | header-y += tcp_metrics.h | 387 | header-y += tcp_metrics.h |
| 388 | header-y += telephony.h | 388 | header-y += telephony.h |
| 389 | header-y += termios.h | 389 | header-y += termios.h |
| 390 | header-y += thermal.h | ||
| 390 | header-y += time.h | 391 | header-y += time.h |
| 391 | header-y += times.h | 392 | header-y += times.h |
| 392 | header-y += timex.h | 393 | header-y += timex.h |
| @@ -0,0 +1,35 @@ | |||
| 1 | #ifndef _UAPI_LINUX_THERMAL_H | ||
| 2 | #define _UAPI_LINUX_THERMAL_H | ||
| 3 | |||
| 4 | #define THERMAL_NAME_LENGTH 20 | ||
| 5 | |||
| 6 | /* Adding event notification support elements */ | ||
| 7 | #define THERMAL_GENL_FAMILY_NAME "thermal_event" | ||
| 8 | #define THERMAL_GENL_VERSION 0x01 | ||
| 9 | #define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_grp" | ||
| 10 | |||
| 11 | /* Events supported by Thermal Netlink */ | ||
| 12 | enum events { | ||
| 13 | THERMAL_AUX0, | ||
| 14 | THERMAL_AUX1, | ||
| 15 | THERMAL_CRITICAL, | ||
| 16 | THERMAL_DEV_FAULT, | ||
| 17 | }; | ||
| 18 | |||
| 19 | /* attributes of thermal_genl_family */ | ||
| 20 | enum { | ||
| 21 | THERMAL_GENL_ATTR_UNSPEC, | ||
| 22 | THERMAL_GENL_ATTR_EVENT, | ||
| 23 | __THERMAL_GENL_ATTR_MAX, | ||
| 24 | }; | ||
| 25 | #define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1) | ||
| 26 | |||
| 27 | /* commands supported by the thermal_genl_family */ | ||
| 28 | enum { | ||
| 29 | THERMAL_GENL_CMD_UNSPEC, | ||
| 30 | THERMAL_GENL_CMD_EVENT, | ||
| 31 | __THERMAL_GENL_CMD_MAX, | ||
| 32 | }; | ||
| 33 | #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) | ||
| 34 | |||
| 35 | #endif /* _UAPI_LINUX_THERMAL_H */ | ||