From: bchihi@baylibre.com
To: rafael@kernel.org, rui.zhang@intel.com,
daniel.lezcano@linaro.org, amitk@kernel.org
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
khilman@baylibre.com, mka@chromium.org, robh+dt@kernel.org,
krzk+dt@kernel.org, matthias.bgg@gmail.com,
p.zabel@pengutronix.de, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, james.lo@mediatek.com,
fan.chen@mediatek.com, louis.yu@mediatek.com,
rex-bc.chen@mediatek.com, abailon@baylibre.com
Subject: [PATCH v9,1/7] thermal: mediatek: Relocate driver to mediatek folder
Date: Wed, 17 Aug 2022 10:07:51 +0200 [thread overview]
Message-ID: <20220817080757.352021-2-bchihi@baylibre.com> (raw)
In-Reply-To: <20220817080757.352021-1-bchihi@baylibre.com>
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 "auxadc_thermal.c" to show its purpose more clearly.
Signed-off-by: Michael Kao <michael.kao@mediatek.com>
Co-developed-by: Ben Tseng <ben.tseng@mediatek.com>
Signed-off-by: Ben Tseng <ben.tseng@mediatek.com>
Co-developed-by: Balsam CHIHI <bchihi@baylibre.com>
Signed-off-by: Balsam CHIHI <bchihi@baylibre.com>
---
drivers/thermal/Kconfig | 14 ++++--------
drivers/thermal/Makefile | 2 +-
drivers/thermal/mediatek/Kconfig | 22 +++++++++++++++++++
drivers/thermal/mediatek/Makefile | 1 +
.../auxadc_thermal.c} | 2 +-
5 files changed, 29 insertions(+), 12 deletions(-)
create mode 100644 drivers/thermal/mediatek/Kconfig
create mode 100644 drivers/thermal/mediatek/Makefile
rename drivers/thermal/{mtk_thermal.c => mediatek/auxadc_thermal.c} (99%)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e052dae614eb..d35f63daca3b 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..8ff32370b591
--- /dev/null
+++ b/drivers/thermal/mediatek/Kconfig
@@ -0,0 +1,22 @@
+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
+ 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..bec325f06a46
--- /dev/null
+++ b/drivers/thermal/mediatek/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MTK_SOC_THERMAL) += auxadc_thermal.o
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
similarity index 99%
rename from drivers/thermal/mtk_thermal.c
rename to drivers/thermal/mediatek/auxadc_thermal.c
index ede94eadddda..60924f8f98e9 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mediatek/auxadc_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
next prev parent reply other threads:[~2022-08-17 8:08 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 8:07 [PATCH v9,0/7] Add LVTS thermal architecture bchihi
2022-08-17 8:07 ` bchihi [this message]
2022-09-14 11:58 ` [PATCH v9,1/7] thermal: mediatek: Relocate driver to mediatek folder AngeloGioacchino Del Regno
2022-09-14 12:55 ` Balsam CHIHI
2022-08-17 8:07 ` [PATCH v9,2/7] dt-bindings: thermal: Add dt-binding document for LVTS thermal controllers bchihi
2022-08-18 13:48 ` Krzysztof Kozlowski
2022-08-18 14:04 ` Balsam CHIHI
2022-08-18 14:08 ` Krzysztof Kozlowski
2022-08-18 14:32 ` Balsam CHIHI
2022-09-14 12:19 ` AngeloGioacchino Del Regno
2022-09-14 14:01 ` Balsam CHIHI
2022-09-21 6:22 ` Krzysztof Kozlowski
2022-09-21 9:44 ` Balsam CHIHI
2022-09-21 6:20 ` Krzysztof Kozlowski
2022-08-17 8:07 ` [PATCH v9,3/7] arm64: dts: mt8192: Add thermal zones and thermal nodes bchihi
2022-09-14 12:26 ` AngeloGioacchino Del Regno
2022-08-17 8:07 ` [PATCH v9,4/7] thermal: mediatek: Add LVTS driver for mt8192 thermal zones bchihi
2022-08-25 17:29 ` Daniel Lezcano
2022-08-26 8:05 ` Balsam CHIHI
2022-09-05 16:44 ` Daniel Lezcano
2022-09-19 16:30 ` Balsam CHIHI
2022-09-14 13:31 ` AngeloGioacchino Del Regno
2022-09-15 16:58 ` Balsam CHIHI
2022-09-16 7:33 ` AngeloGioacchino Del Regno
2022-09-16 8:15 ` Balsam CHIHI
2022-08-17 8:07 ` [PATCH v9,5/7] arm64: dts: mt8195: Add efuse node to mt8195 bchihi
2022-09-14 12:23 ` AngeloGioacchino Del Regno
2022-08-17 8:07 ` [PATCH v9,6/7] arm64: dts: mt8195: Add thermal zones and thermal nodes bchihi
2022-09-14 12:25 ` AngeloGioacchino Del Regno
2022-08-17 8:07 ` [PATCH v9,7/7] thermal: mediatek: Add LVTS driver settings for mt8195 thermal zones bchihi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220817080757.352021-2-bchihi@baylibre.com \
--to=bchihi@baylibre.com \
--cc=abailon@baylibre.com \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=fan.chen@mediatek.com \
--cc=james.lo@mediatek.com \
--cc=khilman@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=louis.yu@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=mka@chromium.org \
--cc=p.zabel@pengutronix.de \
--cc=rafael@kernel.org \
--cc=rex-bc.chen@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).