From: bchihi@baylibre.com To: daniel.lezcano@linaro.org, angelogioacchino.delregno@collabora.com, rafael@kernel.org, amitk@kernel.org, rui.zhang@intel.com, matthias.bgg@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, rdunlap@infradead.org, ye.xingchen@zte.com.cn, p.zabel@pengutronix.de Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, khilman@baylibre.com, james.lo@mediatek.com, rex-bc.chen@mediatek.com Subject: [PATCH v11 1/6] thermal/drivers/mediatek: Relocate driver to mediatek folder Date: Tue, 24 Jan 2023 14:17:12 +0100 [thread overview] Message-ID: <20230124131717.128660-2-bchihi@baylibre.com> (raw) In-Reply-To: <20230124131717.128660-1-bchihi@baylibre.com> From: Balsam CHIHI <bchihi@baylibre.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: Balsam CHIHI <bchihi@baylibre.com> --- drivers/thermal/Kconfig | 14 ++++--------- drivers/thermal/Makefile | 2 +- drivers/thermal/mediatek/Kconfig | 21 +++++++++++++++++++ drivers/thermal/mediatek/Makefile | 1 + .../auxadc_thermal.c} | 2 +- 5 files changed, 28 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 eaeb2b2ee6e9..4cd7ab707315 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -416,16 +416,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 60f0dfa9aae2..1c460d189bd7 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -56,7 +56,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 diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig new file mode 100644 index 000000000000..7558a847d4e9 --- /dev/null +++ b/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 diff --git a/drivers/thermal/mediatek/Makefile b/drivers/thermal/mediatek/Makefile new file mode 100644 index 000000000000..53e86e30b26f --- /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 9a8b107900e9..90ae6b5c530e 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
WARNING: multiple messages have this Message-ID (diff)
From: bchihi@baylibre.com To: daniel.lezcano@linaro.org, angelogioacchino.delregno@collabora.com, rafael@kernel.org, amitk@kernel.org, rui.zhang@intel.com, matthias.bgg@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, rdunlap@infradead.org, ye.xingchen@zte.com.cn, p.zabel@pengutronix.de Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, khilman@baylibre.com, james.lo@mediatek.com, rex-bc.chen@mediatek.com Subject: [PATCH v11 1/6] thermal/drivers/mediatek: Relocate driver to mediatek folder Date: Tue, 24 Jan 2023 14:17:12 +0100 [thread overview] Message-ID: <20230124131717.128660-2-bchihi@baylibre.com> (raw) In-Reply-To: <20230124131717.128660-1-bchihi@baylibre.com> From: Balsam CHIHI <bchihi@baylibre.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: Balsam CHIHI <bchihi@baylibre.com> --- drivers/thermal/Kconfig | 14 ++++--------- drivers/thermal/Makefile | 2 +- drivers/thermal/mediatek/Kconfig | 21 +++++++++++++++++++ drivers/thermal/mediatek/Makefile | 1 + .../auxadc_thermal.c} | 2 +- 5 files changed, 28 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 eaeb2b2ee6e9..4cd7ab707315 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -416,16 +416,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 60f0dfa9aae2..1c460d189bd7 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -56,7 +56,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 diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig new file mode 100644 index 000000000000..7558a847d4e9 --- /dev/null +++ b/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 diff --git a/drivers/thermal/mediatek/Makefile b/drivers/thermal/mediatek/Makefile new file mode 100644 index 000000000000..53e86e30b26f --- /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 9a8b107900e9..90ae6b5c530e 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-01-24 13:17 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-24 13:17 [PATCH v11 0/6] Add LVTS thermal architecture bchihi 2023-01-24 13:17 ` bchihi 2023-01-24 13:17 ` bchihi [this message] 2023-01-24 13:17 ` [PATCH v11 1/6] thermal/drivers/mediatek: Relocate driver to mediatek folder bchihi 2023-01-24 15:37 ` AngeloGioacchino Del Regno 2023-01-24 15:37 ` AngeloGioacchino Del Regno 2023-01-25 15:02 ` Balsam CHIHI 2023-01-25 15:02 ` Balsam CHIHI 2023-01-24 13:17 ` [PATCH v11 2/6] dt-bindings/thermal/mediatek: Add LVTS thermal controllers dt-binding definition bchihi 2023-01-24 13:17 ` bchihi 2023-01-25 11:14 ` Daniel Lezcano 2023-01-25 11:14 ` Daniel Lezcano 2023-01-25 20:35 ` Rob Herring 2023-01-25 20:35 ` Rob Herring 2023-01-25 21:13 ` Daniel Lezcano 2023-01-25 21:13 ` Daniel Lezcano 2023-01-25 20:34 ` Rob Herring 2023-01-25 20:34 ` Rob Herring 2023-01-26 10:33 ` Balsam CHIHI 2023-01-26 10:33 ` Balsam CHIHI 2023-01-26 16:10 ` [PATCH v12 2/6] dt-bindings: thermal: mediatek: " bchihi 2023-01-26 16:10 ` bchihi 2023-01-27 22:10 ` Daniel Lezcano 2023-01-27 22:10 ` Daniel Lezcano 2023-01-28 10:50 ` Krzysztof Kozlowski 2023-01-28 10:50 ` Krzysztof Kozlowski 2023-01-30 10:49 ` Balsam CHIHI 2023-01-30 10:49 ` Balsam CHIHI 2023-01-28 10:48 ` Krzysztof Kozlowski 2023-01-28 10:48 ` Krzysztof Kozlowski 2023-01-30 10:40 ` Balsam CHIHI 2023-01-30 10:40 ` Balsam CHIHI 2023-01-30 11:18 ` Matthias Brugger 2023-01-30 11:18 ` Matthias Brugger 2023-01-30 12:19 ` Balsam CHIHI 2023-01-30 12:19 ` Balsam CHIHI 2023-01-30 16:07 ` Matthias Brugger 2023-01-30 16:07 ` Matthias Brugger 2023-01-31 16:53 ` Krzysztof Kozlowski 2023-01-31 16:53 ` Krzysztof Kozlowski 2023-01-31 17:01 ` Daniel Lezcano 2023-01-31 17:01 ` Daniel Lezcano 2023-01-31 14:04 ` [PATCH v3] dt-bindings: thermal: mediatek: Add LVTS thermal controllers bchihi 2023-01-31 14:04 ` bchihi 2023-02-01 7:46 ` Krzysztof Kozlowski 2023-02-01 7:46 ` Krzysztof Kozlowski 2023-02-01 13:34 ` Balsam CHIHI 2023-02-01 13:34 ` Balsam CHIHI 2023-02-01 13:37 ` Krzysztof Kozlowski 2023-02-01 13:37 ` Krzysztof Kozlowski 2023-02-01 13:56 ` Balsam CHIHI 2023-02-01 13:56 ` Balsam CHIHI 2023-03-07 13:42 ` [PATCH] thermal/drivers/mediatek/lvts_thermal: fix memcpy's number of bytes in lvts_calibration_init() bchihi 2023-03-07 13:42 ` bchihi 2023-03-08 9:10 ` AngeloGioacchino Del Regno 2023-03-08 9:10 ` AngeloGioacchino Del Regno 2023-03-09 12:37 ` Dan Carpenter 2023-03-09 12:37 ` Dan Carpenter 2023-01-24 13:17 ` [PATCH v11 3/6] arm64/dts/mt8195: Add efuse node to mt8195 bchihi 2023-01-24 13:17 ` bchihi 2023-01-25 14:25 ` Matthias Brugger 2023-01-25 14:25 ` Matthias Brugger 2023-01-25 15:04 ` Balsam CHIHI 2023-01-25 15:04 ` Balsam CHIHI 2023-01-24 13:17 ` [PATCH v11 4/6] thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver bchihi 2023-01-24 13:17 ` bchihi 2023-01-24 15:31 ` AngeloGioacchino Del Regno 2023-01-24 15:31 ` AngeloGioacchino Del Regno 2023-01-25 15:06 ` Balsam CHIHI 2023-01-25 15:06 ` Balsam CHIHI 2023-01-31 15:38 ` [PATCH v12] thermal: drivers: mediatek: " bchihi 2023-01-31 15:38 ` bchihi 2023-02-01 3:09 ` kernel test robot 2023-02-01 3:09 ` kernel test robot 2023-02-01 7:47 ` Krzysztof Kozlowski 2023-02-01 7:47 ` Krzysztof Kozlowski 2023-02-01 15:14 ` Balsam CHIHI 2023-02-01 15:14 ` Balsam CHIHI 2023-02-01 7:55 ` Krzysztof Kozlowski 2023-02-01 7:55 ` Krzysztof Kozlowski 2023-02-01 16:46 ` Balsam CHIHI 2023-02-01 16:46 ` Balsam CHIHI 2023-02-01 16:59 ` Matthias Brugger 2023-02-01 16:59 ` Matthias Brugger 2023-02-03 10:35 ` Balsam CHIHI 2023-02-03 10:35 ` Balsam CHIHI 2023-02-01 17:12 ` Krzysztof Kozlowski 2023-02-01 17:12 ` Krzysztof Kozlowski 2023-02-03 11:06 ` Balsam CHIHI 2023-02-03 11:06 ` Balsam CHIHI 2023-02-06 14:07 ` Daniel Lezcano 2023-02-06 14:07 ` Daniel Lezcano 2023-02-06 14:30 ` Krzysztof Kozlowski 2023-02-06 14:30 ` Krzysztof Kozlowski 2023-02-06 14:38 ` Daniel Lezcano 2023-02-06 14:38 ` Daniel Lezcano 2023-02-06 14:32 ` Balsam CHIHI 2023-02-06 14:32 ` Balsam CHIHI 2023-01-24 13:17 ` [PATCH v11 5/6] arm64/dts/mt8195: Add thermal zones and thermal nodes bchihi 2023-01-24 13:17 ` bchihi 2023-01-24 15:36 ` AngeloGioacchino Del Regno 2023-01-24 15:36 ` AngeloGioacchino Del Regno 2023-01-25 15:10 ` Balsam CHIHI 2023-01-25 15:10 ` Balsam CHIHI 2023-01-25 19:09 ` Matthias Brugger 2023-01-25 19:09 ` Matthias Brugger 2023-01-26 9:43 ` Balsam CHIHI 2023-01-26 9:43 ` Balsam CHIHI 2023-01-31 15:37 ` [PATCH v12] arm64: dts: mediatek: mt8195: " bchihi 2023-01-31 15:37 ` bchihi 2023-01-24 13:17 ` [PATCH v11 6/6] arm64/dts/mt8195: Add temperature mitigation threshold bchihi 2023-01-24 13:17 ` bchihi 2023-01-24 15:36 ` AngeloGioacchino Del Regno 2023-01-24 15:36 ` AngeloGioacchino Del Regno
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=20230124131717.128660-2-bchihi@baylibre.com \ --to=bchihi@baylibre.com \ --cc=amitk@kernel.org \ --cc=angelogioacchino.delregno@collabora.com \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=james.lo@mediatek.com \ --cc=khilman@baylibre.com \ --cc=krzysztof.kozlowski+dt@linaro.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=matthias.bgg@gmail.com \ --cc=p.zabel@pengutronix.de \ --cc=rafael@kernel.org \ --cc=rdunlap@infradead.org \ --cc=rex-bc.chen@mediatek.com \ --cc=robh+dt@kernel.org \ --cc=rui.zhang@intel.com \ --cc=ye.xingchen@zte.com.cn \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.