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.
Signed-off-by: Michael Kao <[email protected]>
---
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 7edc8dc6bbab..b2da0a1bda34 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -401,16 +401,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 b64dd50a6629..f9e07c3f529e 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_ZX2967_THERMAL) += zx2967_thermal.o
obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig
new file mode 100644
index 000000000000..0351e73170b7
--- /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..f75313ddce5e
--- /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
--
2.18.0
On 07/04/2021 11:08, Michael Kao wrote:
> Hi Maintainers,
>
> Gentle pin for this patch.
>
> Thanks
ack, pong
--
<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
Hi Maintainers,
Gentle pin for this patch.
Thanks
On Fri, 2021-03-12 at 11:40 +0800, Michael Kao 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.
>
> Signed-off-by: Michael Kao <[email protected]>
> ---
> 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 7edc8dc6bbab..b2da0a1bda34 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -401,16 +401,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 b64dd50a6629..f9e07c3f529e 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_ZX2967_THERMAL) += zx2967_thermal.o
> obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig
> new file mode 100644
> index 000000000000..0351e73170b7
> --- /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..f75313ddce5e
> --- /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
On 12/03/2021 04:40, Michael Kao 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.
We already know the purpose :)
soc_temp gives no additional information.
Either keep the name or give the hardware sensor name. It is a driver
directory.
> Signed-off-by: Michael Kao <[email protected]>
> ---
> 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
[ ... ]
vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
> +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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
All the above not needed.
> +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..f75313ddce5e
> --- /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
On Tue, 2021-04-20 at 23:22 +0200, Daniel Lezcano wrote:
> On 12/03/2021 04:40, Michael Kao 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.
>
> We already know the purpose :)
>
> soc_temp gives no additional information.
>
> Either keep the name or give the hardware sensor name. It is a driver
> directory.
>
Dear Daniel,
We introduce the new thermal hardware design called lvts in the new
project. The new project will desgin with lvts will enable the
CONFIG_MTK_SOC_THERMAL_LVTS to build lvts driver[1].
The old project will use CONFIG_MTK_THERMAL to build soc_temp.c.
The new design use lvts device to access thermal sensors in the soc.
The original design access thermal sensors by auxadc.
[1] [v3,2/3] thermal: mediatek: Add LVTS drivers for SoC theraml zones
> > Signed-off-by: Michael Kao <[email protected]>
> > ---
> > 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
>
> [ ... ]
>
> vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
>
>
> > +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
>
>
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> All the above not needed.
>
> > +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..f75313ddce5e
> > --- /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
>
>
>
On Tue, 2021-04-20 at 23:22 +0200, Daniel Lezcano wrote:
> On 12/03/2021 04:40, Michael Kao 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.
>
> We already know the purpose :)
>
> soc_temp gives no additional information.
>
> Either keep the name or give the hardware sensor name. It is a driver
> directory.
>
Dear Daniel,
The new thermal hardware design called lvts (Low voltage thermal
sensor).
Instead of original one using auxadc, the lvts use lvts device to
access thermal senosrs.
It will save power and be more efficient.
We use the config CONFIG_MTK_THERMAL and CONFIG_MTK_SOC_THERMAL_LVTS[1]
to select the different hardware archtecture.
[1] [v3,2/3] thermal: mediatek: Add LVTS drivers for SoC theraml zones
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
> > Signed-off-by: Michael Kao <[email protected]>
> > ---
> > 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
>
> [ ... ]
>
> vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
>
>
> > +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
>
>
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> All the above not needed.
>
> > +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..f75313ddce5e
> > --- /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
>
>
>