Skip to content

Commit

Permalink
thermal: drivers: mediatek: Relocate driver to mediatek folder
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bchihiBL authored and intel-lab-lkp committed Feb 7, 2023
1 parent a2c81dc commit 0eb8999
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
14 changes: 4 additions & 10 deletions drivers/thermal/Kconfig
Expand Up @@ -412,16 +412,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"
Expand Down
2 changes: 1 addition & 1 deletion drivers/thermal/Makefile
Expand Up @@ -55,7 +55,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
Expand Down
21 changes: 21 additions & 0 deletions 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
1 change: 1 addition & 0 deletions drivers/thermal/mediatek/Makefile
@@ -0,0 +1 @@
obj-$(CONFIG_MTK_SOC_THERMAL) += auxadc_thermal.o
Expand Up @@ -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
Expand Down

0 comments on commit 0eb8999

Please sign in to comment.