| Message ID | 20220804130912.676043-2-bchihi@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add LVTS architecture thermal | expand |
Hi Balsam, On Thu, Aug 04, 2022 at 03:09:06PM +0200, bchihi@baylibre.com wrote: > From: Michael Kao <michael.kao@mediatek.com> > > Add MediaTek proprietary folder to upstream more thermal zone and cooler > drivers, relocate the original thermal controller driver to it, and rename it > as "mtxxxx_thermal.c" to show its purpose more clearly. > > Signed-off-by: Michael Kao <michael.kao@mediatek.com> > Signed-off-by: Ben Tseng <ben.tseng@mediatek.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 + > .../mtxxxx_thermal.c} | 2 +- > 5 files changed, 30 insertions(+), 12 deletions(-) > create mode 100644 drivers/thermal/mediatek/Kconfig > create mode 100644 drivers/thermal/mediatek/Makefile > rename drivers/thermal/{mtk_thermal.c => mediatek/mtxxxx_thermal.c} (99%) [..] > --- /dev/null > +++ b/drivers/thermal/mediatek/Makefile > @@ -0,0 +1 @@ > +obj-$(CONFIG_MTK_SOC_THERMAL) += mtxxxx_thermal.o > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/mtxxxx_thermal.c When Daniel suggested using a more SoC explicit name like 'mtxxx_thermal' [1] the xxxx was supposed to be substituted for the actual SoC (family) that makes use of this driver :-). From the compatibles looks like we have mt8173, mt2701, mt2712, mt7622, mt8183. So it doesn't look like it's a single SoC family... What about calling it auxadc_thermal? Thanks, Nícolas [1] https://lore.kernel.org/linux-mediatek/24250d03-b25f-e521-5abd-f36109885c36@linaro.org/ > similarity index 99% > rename from drivers/thermal/mtk_thermal.c > rename to drivers/thermal/mediatek/mtxxxx_thermal.c > index ede94eadddda..60924f8f98e9 100644 > --- a/drivers/thermal/mtk_thermal.c > +++ b/drivers/thermal/mediatek/mtxxxx_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 > -- > 2.34.1 > >
On Fri, Aug 5, 2022 at 1:04 AM Nícolas F. R. A. Prado <nfraprado@collabora.com> wrote: > > Hi Balsam, > > On Thu, Aug 04, 2022 at 03:09:06PM +0200, bchihi@baylibre.com wrote: > > From: Michael Kao <michael.kao@mediatek.com> > > > > Add MediaTek proprietary folder to upstream more thermal zone and cooler > > drivers, relocate the original thermal controller driver to it, and rename it > > as "mtxxxx_thermal.c" to show its purpose more clearly. > > > > Signed-off-by: Michael Kao <michael.kao@mediatek.com> > > Signed-off-by: Ben Tseng <ben.tseng@mediatek.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 + > > .../mtxxxx_thermal.c} | 2 +- > > 5 files changed, 30 insertions(+), 12 deletions(-) > > create mode 100644 drivers/thermal/mediatek/Kconfig > > create mode 100644 drivers/thermal/mediatek/Makefile > > rename drivers/thermal/{mtk_thermal.c => mediatek/mtxxxx_thermal.c} (99%) > [..] > > --- /dev/null > > +++ b/drivers/thermal/mediatek/Makefile > > @@ -0,0 +1 @@ > > +obj-$(CONFIG_MTK_SOC_THERMAL) += mtxxxx_thermal.o > > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/mtxxxx_thermal.c > > When Daniel suggested using a more SoC explicit name like 'mtxxx_thermal' [1] > the xxxx was supposed to be substituted for the actual SoC (family) that makes > use of this driver :-). > > From the compatibles looks like we have mt8173, mt2701, mt2712, mt7622, mt8183. > So it doesn't look like it's a single SoC family... What about calling it > auxadc_thermal? > > Thanks, > Nícolas Hello Nícolas, "auxadc_thermal.c" makes more sense, since we have "lvts_thermal.c". Thank you for the suggestion. I will take it. Best regards, Balsam > > [1] https://lore.kernel.org/linux-mediatek/24250d03-b25f-e521-5abd-f36109885c36@linaro.org/ > > > similarity index 99% > > rename from drivers/thermal/mtk_thermal.c > > rename to drivers/thermal/mediatek/mtxxxx_thermal.c > > index ede94eadddda..60924f8f98e9 100644 > > --- a/drivers/thermal/mtk_thermal.c > > +++ b/drivers/thermal/mediatek/mtxxxx_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 > > -- > > 2.34.1 > > > >
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..f7daeb8056c4 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-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 index 000000000000..592c849b9fed --- /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..c2b9a166fbef --- /dev/null +++ b/drivers/thermal/mediatek/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_MTK_SOC_THERMAL) += mtxxxx_thermal.o diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/mtxxxx_thermal.c similarity index 99% rename from drivers/thermal/mtk_thermal.c rename to drivers/thermal/mediatek/mtxxxx_thermal.c index ede94eadddda..60924f8f98e9 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mediatek/mtxxxx_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