thermal/drivers/mediatek: Relocate driver to mediatek folder

Add MediaTek proprietary folder to upstream more thermal zone and cooler
drivers, relocate the original thermal controller driver to it, and rename it
as "auxadc_thermal.c" to show its purpose more clearly.

Signed-off-by: Balsam CHIHI <bchihi@baylibre.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230209105628.50294-2-bchihi@baylibre.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index eaeb2b2ee6e9e503bc193fbf19a46342db3e0809..4cd7ab7073150b716f801c1c9d4b5da061942676 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -416,16 +416,10 @@ config DA9062_THERMAL
          zone.
          Compatible with the DA9062 and DA9061 PMICs.
 
-config MTK_THERMAL
-       tristate "Temperature sensor driver for mediatek SoCs"
-       depends on ARCH_MEDIATEK || COMPILE_TEST
-       depends on HAS_IOMEM
-       depends on NVMEM || NVMEM=n
-       depends on RESET_CONTROLLER
-       default y
-       help
-         Enable this option if you want to have support for thermal management
-         controller present in Mediatek SoCs
+menu "Mediatek thermal drivers"
+depends on ARCH_MEDIATEK || COMPILE_TEST
+source "drivers/thermal/mediatek/Kconfig"
+endmenu
 
 config AMLOGIC_THERMAL
        tristate "Amlogic Thermal Support"

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index b9b5dc86f5fdce30203feb2ae62600cf03a9e433..eed300e83d480eecde567cea5366585cf158141f 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -56,7 +56,7 @@ obj-y                         += st/
 obj-y                          += qcom/
 obj-y                          += tegra/
 obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o
-obj-$(CONFIG_MTK_THERMAL)      += mtk_thermal.o
+obj-y                          += mediatek/
 obj-$(CONFIG_GENERIC_ADC_THERMAL)      += thermal-generic-adc.o
 obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
 obj-$(CONFIG_AMLOGIC_THERMAL)     += amlogic_thermal.o

diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig
new file mode 100644 (file)
index 0000000..7558a84
--- /dev/null
+++ b/drivers/thermal/mediatek/Kconfig
@@ -0,0 +1,21 @@
+config MTK_THERMAL
+       tristate "MediaTek thermal drivers"
+       depends on THERMAL_OF
+       help
+         This is the option for MediaTek thermal software solutions.
+         Please enable corresponding options to get temperature
+         information from thermal sensors or turn on throttle
+         mechaisms for thermal mitigation.
+
+if MTK_THERMAL
+
+config MTK_SOC_THERMAL
+       tristate "AUXADC temperature sensor driver for MediaTek SoCs"
+       depends on HAS_IOMEM
+       help
+         Enable this option if you want to get SoC temperature
+         information for MediaTek platforms.
+         This driver configures thermal controllers to collect
+         temperature via AUXADC interface.
+
+endif

diff --git a/drivers/thermal/mediatek/Makefile b/drivers/thermal/mediatek/Makefile
new file mode 100644 (file)
index 0000000..53e86e3
--- /dev/null
+++ b/drivers/thermal/mediatek/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MTK_SOC_THERMAL)  += auxadc_thermal.o

diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
similarity index 99%
rename from drivers/thermal/mtk_thermal.c
rename to drivers/thermal/mediatek/auxadc_thermal.c
index 3c633584a88e63afde57586b59f8486aa10a41ca..ab730f9552d0e00a0a96c59c0f6441242e769994 100644 (file)
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mediatek/auxadc_thermal.c
@@ -23,7 +23,7 @@
 #include <linux/reset.h>
 #include <linux/types.h>
 
-#include "thermal_hwmon.h"
+#include "../thermal_hwmon.h"
 
 /* AUXADC Registers */
 #define AUXADC_CON1_SET_V      0x008