tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull more thermal control updates from Rafael Wysocki:
"Fix RZ/G3E driver introduction fall-out (Geert Uytterhoeven) and
improve the compilation and installation of the thermal library for
user space (Emil Dahl Juhl and Sascha Hauer)"

* tag 'thermal-6.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
tools: lib: thermal: expose thermal_exit symbols
tools: lib: thermal: don't preserve owner in install
tools: lib: thermal: use pkg-config to locate libnl3
thermal: renesas: Fix RZ/G3E fall-out

Linus Torvalds 56019d4f 89b59f09

+25 -18
+7 -7
MAINTAINERS
··· 21947 21947 F: Documentation/devicetree/bindings/iio/potentiometer/renesas,x9250.yaml 21948 21948 F: drivers/iio/potentiometer/x9250.c 21949 21949 21950 - RENESAS RZ/G3S THERMAL SENSOR UNIT DRIVER 21951 - M: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> 21952 - L: linux-pm@vger.kernel.org 21953 - S: Maintained 21954 - F: Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml 21955 - F: drivers/thermal/renesas/rzg3s_thermal.c 21956 - 21957 21950 RENESAS RZ/G3E THERMAL SENSOR UNIT DRIVER 21958 21951 M: John Madieu <john.madieu.xa@bp.renesas.com> 21959 21952 L: linux-pm@vger.kernel.org 21960 21953 S: Maintained 21961 21954 F: Documentation/devicetree/bindings/thermal/renesas,r9a09g047-tsu.yaml 21962 21955 F: drivers/thermal/renesas/rzg3e_thermal.c 21956 + 21957 + RENESAS RZ/G3S THERMAL SENSOR UNIT DRIVER 21958 + M: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> 21959 + L: linux-pm@vger.kernel.org 21960 + S: Maintained 21961 + F: Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml 21962 + F: drivers/thermal/renesas/rzg3s_thermal.c 21963 21963 21964 21964 RESET CONTROLLER FRAMEWORK 21965 21965 M: Philipp Zabel <p.zabel@pengutronix.de>
+7 -7
drivers/thermal/renesas/Kconfig
··· 27 27 Enable this to plug the RZ/G2L thermal sensor driver into the Linux 28 28 thermal framework. 29 29 30 + config RZG3E_THERMAL 31 + tristate "Renesas RZ/G3E thermal driver" 32 + depends on ARCH_RENESAS || COMPILE_TEST 33 + help 34 + Enable this to plug the RZ/G3E thermal sensor driver into the Linux 35 + thermal framework. 36 + 30 37 config RZG3S_THERMAL 31 38 tristate "Renesas RZ/G3S thermal driver" 32 39 depends on ARCH_R9A08G045 || COMPILE_TEST 33 40 depends on OF && IIO && RZG2L_ADC 34 41 help 35 42 Enable this to plug the RZ/G3S thermal sensor driver into the Linux 36 - thermal framework. 37 - 38 - config RZG3E_THERMAL 39 - tristate "Renesas RZ/G3E thermal driver" 40 - depends on ARCH_RENESAS || COMPILE_TEST 41 - help 42 - Enable this to plug the RZ/G3E thermal sensor driver into the Linux 43 43 thermal framework.
-1
drivers/thermal/renesas/Makefile
··· 5 5 obj-$(CONFIG_RZG2L_THERMAL) += rzg2l_thermal.o 6 6 obj-$(CONFIG_RZG3E_THERMAL) += rzg3e_thermal.o 7 7 obj-$(CONFIG_RZG3S_THERMAL) += rzg3s_thermal.o 8 -
+7 -2
tools/lib/thermal/Makefile
··· 46 46 CFLAGS := -g -Wall 47 47 endif 48 48 49 + NL3_CFLAGS = $(shell pkg-config --cflags libnl-3.0 2>/dev/null) 50 + ifeq ($(NL3_CFLAGS),) 51 + NL3_CFLAGS = -I/usr/include/libnl3 52 + endif 53 + 49 54 INCLUDES = \ 50 - -I/usr/include/libnl3 \ 51 55 -I$(srctree)/tools/lib/thermal/include \ 52 56 -I$(srctree)/tools/lib/ \ 53 57 -I$(srctree)/tools/include \ ··· 63 59 override CFLAGS += $(EXTRA_WARNINGS) 64 60 override CFLAGS += -Werror -Wall 65 61 override CFLAGS += -fPIC 62 + override CFLAGS += $(NL3_CFLAGS) 66 63 override CFLAGS += $(INCLUDES) 67 64 override CFLAGS += -fvisibility=hidden 68 65 override CFGLAS += -Wl,-L. ··· 139 134 install_lib: libs 140 135 $(call QUIET_INSTALL, $(LIBTHERMAL_ALL)) \ 141 136 $(call do_install_mkdir,$(libdir_SQ)); \ 142 - cp -fpR $(LIBTHERMAL_ALL) $(DESTDIR)$(libdir_SQ) 137 + cp -fR --preserve=mode,timestamp $(LIBTHERMAL_ALL) $(DESTDIR)$(libdir_SQ) 143 138 144 139 install_headers: 145 140 $(call QUIET_INSTALL, headers) \
+4 -1
tools/lib/thermal/libthermal.map
··· 1 1 LIBTHERMAL_0.0.1 { 2 2 global: 3 - thermal_init; 4 3 for_each_thermal_zone; 5 4 for_each_thermal_trip; 6 5 for_each_thermal_cdev; ··· 8 9 thermal_zone_find_by_id; 9 10 thermal_zone_discover; 10 11 thermal_init; 12 + thermal_exit; 13 + thermal_events_exit; 11 14 thermal_events_init; 12 15 thermal_events_handle; 13 16 thermal_events_fd; 17 + thermal_cmd_exit; 14 18 thermal_cmd_init; 15 19 thermal_cmd_get_tz; 16 20 thermal_cmd_get_cdev; ··· 24 22 thermal_cmd_threshold_add; 25 23 thermal_cmd_threshold_delete; 26 24 thermal_cmd_threshold_flush; 25 + thermal_sampling_exit; 27 26 thermal_sampling_init; 28 27 thermal_sampling_handle; 29 28 thermal_sampling_fd;