Commit fad399eb authored by Balsam CHIHI's avatar Balsam CHIHI Committed by Rafael J. Wysocki
Browse files

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: default avatarBalsam CHIHI <bchihi@baylibre.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230209105628.50294-2-bchihi@baylibre.com


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a29cbd76

drivers/thermal/Kconfig

+4 −10
Original line number Diff line number Diff line
@@ -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"

menu "Mediatek thermal drivers"

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

source "drivers/thermal/mediatek/Kconfig"

endmenu



config AMLOGIC_THERMAL

	tristate "Amlogic Thermal Support"

drivers/thermal/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/thermal/mediatek/Kconfig

0 → 100644
+21 −0
Original line number Diff line number Diff line 
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

drivers/thermal/mediatek/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MTK_SOC_THERMAL)	+= auxadc_thermal.o

drivers/thermal/mtk_thermal.c→drivers/thermal/mediatek/auxadc_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -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