Messages in this thread Patch in this message | | | Date | Thu, 28 Jul 2022 10:53:43 +0200 | Subject | Re: [PATCH v8 1/6] thermal: mediatek: Relocate driver to mediatek folder | From | Daniel Lezcano <> |
| |
Hi Balsam,
On 26/07/2022 15:55, Balsam CHIHI wrote: > Add Mediatek proprietary folder to upstream more thermal zone and cooler > drivers. Relocate the original thermal controller driver to it and rename > as soc_temp.c to show its purpose more clearly.
I realize the Kconfig, Makefiles format are not consistent across the boards. Before I fix this, you can comply to the format:
drivers/thermal/Kconfig:
menu "Mediatek thermal drivers" depends on ARCH_MEDIATEK || COMPILE_TEST source "drivers/thermal/mediatek/Kconfig" endmenu
drivers/thermal/Makefile:
-obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o +obj-y += mediatek
drivers/thermal/mediatek/Kconfig:
config MTK_SOC_THERMAL tristate "Temperature sensor driver for MediaTek SoCs" depends on HAS_IOMEM depends on NVMEM depends on RESET_CONTROLLER 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.
drivers/thermal/mediatek/Makefile:
obj-$(MTK_SOC_THERMAL) += soc_temp.o
However, rename 'soc_temp' to something more SoC explicit, eg. mtxxx_thermal.c
Thanks
-- Daniel
> Signed-off-by: Michael Kao <michael.kao@mediatek.com> > Signed-off-by: Ben Tseng <ben.tseng@mediatek.com> > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > Signed-off-by: Balsam CHIHI <bchihi@baylibre.com>
> --- > drivers/thermal/Kconfig | 14 ++++------- > drivers/thermal/Makefile | 2 +- > drivers/thermal/mediatek/Kconfig | 23 +++++++++++++++++++ > drivers/thermal/mediatek/Makefile | 1 + > .../{mtk_thermal.c => mediatek/soc_temp.c} | 0 > 5 files changed, 29 insertions(+), 11 deletions(-) > create mode 100644 drivers/thermal/mediatek/Kconfig > create mode 100644 drivers/thermal/mediatek/Makefile > rename drivers/thermal/{mtk_thermal.c => mediatek/soc_temp.c} (100%) > > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig > index 0e5cc948373c..ecba8d6e313b 100644 > --- a/drivers/thermal/Kconfig > +++ b/drivers/thermal/Kconfig > @@ -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" > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile > index def8e1a0399c..3c00e864ad55 100644 > --- a/drivers/thermal/Makefile > +++ b/drivers/thermal/Makefile > @@ -55,7 +55,7 @@ obj-y += st/ > obj-$(CONFIG_QCOM_TSENS) += qcom/ > obj-y += tegra/ > obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o > -obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o > +obj-$(CONFIG_MTK_THERMAL) += 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 > index 000000000000..9c41e9079fc3 > --- /dev/null > +++ b/drivers/thermal/mediatek/Kconfig > @@ -0,0 +1,23 @@ > +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 "Temperature sensor driver for MediaTek SoCs" > + depends on HAS_IOMEM > + depends on NVMEM > + depends on RESET_CONTROLLER > + 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 > index 000000000000..4b4cb04a358f > --- /dev/null > +++ b/drivers/thermal/mediatek/Makefile > @@ -0,0 +1 @@ > +obj-$(CONFIG_MTK_SOC_THERMAL) += soc_temp.o > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/soc_temp.c > similarity index 100% > rename from drivers/thermal/mtk_thermal.c > rename to drivers/thermal/mediatek/soc_temp.c
-- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
| |