Commit 56019d4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 89b59f09 dea00c20

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -21947,13 +21947,6 @@ S: Maintained 
F:	Documentation/devicetree/bindings/iio/potentiometer/renesas,x9250.yaml

F:	drivers/iio/potentiometer/x9250.c









RENESAS RZ/G3S THERMAL SENSOR UNIT DRIVER









M:	Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml









F:	drivers/thermal/renesas/rzg3s_thermal.c

















RENESAS RZ/G3E THERMAL SENSOR UNIT DRIVER









M:	John Madieu <john.madieu.xa@bp.renesas.com>









L:	linux-pm@vger.kernel.org








@@ -21961,6 +21954,13 @@ S:	Maintained







F:	Documentation/devicetree/bindings/thermal/renesas,r9a09g047-tsu.yaml









F:	drivers/thermal/renesas/rzg3e_thermal.c

















RENESAS RZ/G3S THERMAL SENSOR UNIT DRIVER









M:	Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml









F:	drivers/thermal/renesas/rzg3s_thermal.c

















RESET CONTROLLER FRAMEWORK









M:	Philipp Zabel <p.zabel@pengutronix.de>









S:	Maintained

























drivers/thermal/renesas/Kconfig



+7
−7






























Original line number
Diff line number
Diff line







@@ -27,6 +27,13 @@ config RZG2L_THERMAL







	  Enable this to plug the RZ/G2L thermal sensor driver into the Linux









	  thermal framework.



















config RZG3E_THERMAL









	tristate "Renesas RZ/G3E thermal driver"









	depends on ARCH_RENESAS || COMPILE_TEST









	help









	  Enable this to plug the RZ/G3E thermal sensor driver into the Linux









	  thermal framework.



















config RZG3S_THERMAL









	tristate "Renesas RZ/G3S thermal driver"









	depends on ARCH_R9A08G045 || COMPILE_TEST








@@ -34,10 +41,3 @@ config RZG3S_THERMAL







	help









	  Enable this to plug the RZ/G3S thermal sensor driver into the Linux









	  thermal framework.


















config RZG3E_THERMAL









	tristate "Renesas RZ/G3E thermal driver"









	depends on ARCH_RENESAS || COMPILE_TEST









	help









	  Enable this to plug the RZ/G3E thermal sensor driver into the Linux









	  thermal framework.
























drivers/thermal/renesas/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -5,4 +5,3 @@ obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o







obj-$(CONFIG_RZG2L_THERMAL)	+= rzg2l_thermal.o









obj-$(CONFIG_RZG3E_THERMAL)	+= rzg3e_thermal.o









obj-$(CONFIG_RZG3S_THERMAL)	+= rzg3s_thermal.o
































tools/lib/thermal/Makefile



+7
−2






























Original line number
Diff line number
Diff line







@@ -46,8 +46,12 @@ else







  CFLAGS := -g -Wall









endif



















NL3_CFLAGS = $(shell pkg-config --cflags libnl-3.0 2>/dev/null)









ifeq ($(NL3_CFLAGS),)









NL3_CFLAGS = -I/usr/include/libnl3









endif



















INCLUDES = \









-I/usr/include/libnl3 \









-I$(srctree)/tools/lib/thermal/include \









-I$(srctree)/tools/lib/ \









-I$(srctree)/tools/include \








@@ -59,6 +63,7 @@ INCLUDES = \







override CFLAGS += $(EXTRA_WARNINGS)









override CFLAGS += -Werror -Wall









override CFLAGS += -fPIC









override CFLAGS += $(NL3_CFLAGS)









override CFLAGS += $(INCLUDES)









override CFLAGS += -fvisibility=hidden









override CFGLAS += -Wl,-L.








@@ -134,7 +139,7 @@ endef







install_lib: libs









	$(call QUIET_INSTALL, $(LIBTHERMAL_ALL)) \









		$(call do_install_mkdir,$(libdir_SQ)); \









		cp -fpR $(LIBTHERMAL_ALL) $(DESTDIR)$(libdir_SQ)









		cp -fR --preserve=mode,timestamp $(LIBTHERMAL_ALL) $(DESTDIR)$(libdir_SQ)



















install_headers:









	$(call QUIET_INSTALL, headers) \
































tools/lib/thermal/libthermal.map



+4
−1






























Original line number
Diff line number
Diff line









LIBTHERMAL_0.0.1 {









	global:









		thermal_init;









		for_each_thermal_zone;









		for_each_thermal_trip;









		for_each_thermal_cdev;








@@ -9,9 +8,12 @@ LIBTHERMAL_0.0.1 {







		thermal_zone_find_by_id;









		thermal_zone_discover;









		thermal_init;









		thermal_exit;









		thermal_events_exit;









		thermal_events_init;









		thermal_events_handle;









		thermal_events_fd;









		thermal_cmd_exit;









		thermal_cmd_init;









		thermal_cmd_get_tz;









		thermal_cmd_get_cdev;








@@ -22,6 +24,7 @@ LIBTHERMAL_0.0.1 {







		thermal_cmd_threshold_add;









		thermal_cmd_threshold_delete;









		thermal_cmd_threshold_flush;









		thermal_sampling_exit;









		thermal_sampling_init;









		thermal_sampling_handle;









		thermal_sampling_fd;