thermal/drivers/renesas: Group all renesas thermal drivers together

Move all Renesas thermal drivers to a vendor specific directory.

All drivers are moved verbatim apart from the updated include path for
thermal_hwmon.h.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20240506154011.344324-2-niklas.soderlund+renesas@ragnatech.se

diff --git a/MAINTAINERS b/MAINTAINERS
index 3c4fdf74a3f9d263a13f7f484122f455d70070aa..03090276a416e08dc10a1ef963d6e9457e6c891e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19076,8 +19076,8 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
 F:     Documentation/devicetree/bindings/thermal/rcar-thermal.yaml
-F:     drivers/thermal/rcar_gen3_thermal.c
-F:     drivers/thermal/rcar_thermal.c
+F:     drivers/thermal/renesas/rcar_gen3_thermal.c
+F:     drivers/thermal/renesas/rcar_thermal.c
 
 RENESAS RIIC DRIVER
 M:     Chris Brandt <chris.brandt@renesas.com>

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 204ed89a3ec9a77db24907b8a01f2e3a6acb8ea8..ed16897584b4891c876f33a3cf47725191e92b6b 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -343,32 +343,6 @@ config ROCKCHIP_THERMAL
          trip point. Cpufreq is used as the cooling device and will throttle
          CPUs when the Temperature crosses the passive trip point.
 
-config RCAR_THERMAL
-       tristate "Renesas R-Car thermal driver"
-       depends on ARCH_RENESAS || COMPILE_TEST
-       depends on HAS_IOMEM
-       help
-         Enable this to plug the R-Car thermal sensor driver into the Linux
-         thermal framework.
-
-config RCAR_GEN3_THERMAL
-       tristate "Renesas R-Car Gen3 and RZ/G2 thermal driver"
-       depends on ARCH_RENESAS || COMPILE_TEST
-       depends on HAS_IOMEM
-       depends on OF
-       help
-         Enable this to plug the R-Car Gen3 or RZ/G2 thermal sensor driver into
-         the Linux thermal framework.
-
-config RZG2L_THERMAL
-       tristate "Renesas RZ/G2L thermal driver"
-       depends on ARCH_RENESAS || COMPILE_TEST
-       depends on HAS_IOMEM
-       depends on OF
-       help
-         Enable this to plug the RZ/G2L thermal sensor driver into the Linux
-         thermal framework.
-
 config KIRKWOOD_THERMAL
        tristate "Temperature sensor on Marvell Kirkwood SoCs"
        depends on MACH_KIRKWOOD || COMPILE_TEST
@@ -459,6 +433,8 @@ depends on (ARCH_STI || ARCH_STM32) && OF
 source "drivers/thermal/st/Kconfig"
 endmenu
 
+source "drivers/thermal/renesas/Kconfig"
+
 source "drivers/thermal/tegra/Kconfig"
 
 config GENERIC_ADC_THERMAL

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 5cdf7d68687f43b3a0f62c15bcb78235e16de679..ce7a4752ef52fe420e837787cec234208008ab3f 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -38,9 +38,7 @@ obj-$(CONFIG_THERMAL_MMIO)            += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)    += spear_thermal.o
 obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o
-obj-$(CONFIG_RCAR_THERMAL)     += rcar_thermal.o
-obj-$(CONFIG_RCAR_GEN3_THERMAL)        += rcar_gen3_thermal.o
-obj-$(CONFIG_RZG2L_THERMAL)    += rzg2l_thermal.o
+obj-y                          += renesas/
 obj-$(CONFIG_KIRKWOOD_THERMAL)  += kirkwood_thermal.o
 obj-y                          += samsung/
 obj-$(CONFIG_DOVE_THERMAL)     += dove_thermal.o

diff --git a/drivers/thermal/renesas/Kconfig b/drivers/thermal/renesas/Kconfig
new file mode 100644 (file)
index 0000000..1be65a0
--- /dev/null
+++ b/drivers/thermal/renesas/Kconfig
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config RCAR_THERMAL
+       tristate "Renesas R-Car thermal driver"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       depends on HAS_IOMEM
+       help
+         Enable this to plug the R-Car thermal sensor driver into the Linux
+         thermal framework.
+
+config RCAR_GEN3_THERMAL
+       tristate "Renesas R-Car Gen3 and RZ/G2 thermal driver"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       depends on HAS_IOMEM
+       depends on OF
+       help
+         Enable this to plug the R-Car Gen3 or RZ/G2 thermal sensor driver into
+         the Linux thermal framework.
+
+config RZG2L_THERMAL
+       tristate "Renesas RZ/G2L thermal driver"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       depends on HAS_IOMEM
+       depends on OF
+       help
+         Enable this to plug the RZ/G2L thermal sensor driver into the Linux
+         thermal framework.

diff --git a/drivers/thermal/renesas/Makefile b/drivers/thermal/renesas/Makefile
new file mode 100644 (file)
index 0000000..bf9cb3c
--- /dev/null
+++ b/drivers/thermal/renesas/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_RCAR_GEN3_THERMAL)        += rcar_gen3_thermal.o
+obj-$(CONFIG_RCAR_THERMAL)     += rcar_thermal.o
+obj-$(CONFIG_RZG2L_THERMAL)    += rzg2l_thermal.o

diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/renesas/rcar_gen3_thermal.c
similarity index 99%
rename from drivers/thermal/rcar_gen3_thermal.c
rename to drivers/thermal/renesas/rcar_gen3_thermal.c
index 02494fa142c34b49ac27d16d8961e112b36aaeca..5c769871753add43b7c23ee1ee5107e52910edfb 100644 (file)
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/renesas/rcar_gen3_thermal.c
@@ -16,7 +16,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/thermal.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 /* Register offsets */
 #define REG_GEN3_IRQSTR                0x04

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/renesas/rcar_thermal.c
similarity index 99%
rename from drivers/thermal/rcar_thermal.c
rename to drivers/thermal/renesas/rcar_thermal.c
index 925183753fcb46f5a75d1c36315c6e3867231edd..1e93f60b6d7445d68b3f7540f7cd2c3207a60737 100644 (file)
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/renesas/rcar_thermal.c
@@ -19,7 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/thermal.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 #define IDLE_INTERVAL  5000
 

diff --git a/drivers/thermal/rzg2l_thermal.c b/drivers/thermal/renesas/rzg2l_thermal.c
similarity index 99%
rename from drivers/thermal/rzg2l_thermal.c
rename to drivers/thermal/renesas/rzg2l_thermal.c
index 04efd824ac4c95f06f09706b7e54746dd88911a4..0e1cb9045ee6ffc187618a9cbd7eb7acbc2d1001 100644 (file)
--- a/drivers/thermal/rzg2l_thermal.c
+++ b/drivers/thermal/renesas/rzg2l_thermal.c
@@ -17,7 +17,7 @@
 #include <linux/thermal.h>
 #include <linux/units.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 #define CTEMP_MASK     0xFFF