From patchwork Tue Jul 26 13:55:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balsam CHIHI X-Patchwork-Id: 593984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BC86C19F21 for ; Tue, 26 Jul 2022 13:55:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234033AbiGZNzY (ORCPT ); Tue, 26 Jul 2022 09:55:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbiGZNzV (ORCPT ); Tue, 26 Jul 2022 09:55:21 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43B4E65DF for ; Tue, 26 Jul 2022 06:55:19 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id v5so8801491wmj.0 for ; Tue, 26 Jul 2022 06:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dRSOiGoOrC3t6wEy50JVXbhAW+sBGO47FPfpEcofjB8=; b=Q+lQXfSdOYweTtKJzxbiF6vBOxH9h8OdLAHXNf/n0nG6zsCHE8AIpH+/efmpIfnSRc Pb5WdypcpBZ0VfseNJOCz0myvzz0WKHSKRRcoqBOFOBq5i52ipO0k9/3pxvi+IQz0VrO o+9cd6Vn18+wEWbiluJSex6r/LS/g08vtVCxyAAEupZ3hFGT2vkq4G2mNkugcwK+qF/K I59oL2bZApaGz0jb724KWJihbYPcW1O2rfbp/Qu9jezJSuKlTXOrWnri+jBOwmjCW3ez FMJTJdXozKK+IlM/hsHcqwmnOt3jEt6F29jaq05vpEaxSKzbPLiYAkeEReFg1fzDhoTC xNQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dRSOiGoOrC3t6wEy50JVXbhAW+sBGO47FPfpEcofjB8=; b=1MVsg9KIPAMFEK03KixuU2AogbVPWxa6pJJfOtsNT4+N04ue4vK0YkQEmNuZCBHugr dZ1sgR2MsEw8ugcCehZBPbVEOuffqkxiJLo8Dux3b0K/LkFy2QpVNMF8rbDfDrAN49h4 6avYc54eNXZtgmI2UlS4m+8Kmz4SICNbP77VH2S6mLAiY9ocVPAjIi9EX3YMKi3qnKAY iB+5LGJbuCXx5JpGmMTQBhy8KYND6May5UMQ+0aOrai9ySpft4RVRlaXqzwEabIl0kWC J7pgHHJxWEYnAuzpnpyzy+70OaI80BBl6eXNb5vtQUbF9QHyW+aUDV54Oq6bPQj4Ch8M XN2w== X-Gm-Message-State: AJIora/cQ6Nk8IFP0IEMGpO8TIWmp4lqi6RBm+/ljyCyFvO1vNR4xZdC zUOFWPbkN+whrMaX9SKrXaLCDQ== X-Google-Smtp-Source: AGRyM1sZyxeaEgHhGQ13XRG2/v6xEMkLueksUGhv81nQ0+a33FhA+AF4RlQf1XcXAmF6X3BM1I5mRA== X-Received: by 2002:a05:600c:3c91:b0:3a3:5230:1a6d with SMTP id bg17-20020a05600c3c9100b003a352301a6dmr8742885wmb.11.1658843717838; Tue, 26 Jul 2022 06:55:17 -0700 (PDT) Received: from Balsam-ThinkPad-T480.baylibre (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id d13-20020adf9c8d000000b0021e4c3b2967sm15244670wre.65.2022.07.26.06.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 06:55:17 -0700 (PDT) From: Balsam CHIHI 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 v8 1/6] thermal: mediatek: Relocate driver to mediatek folder Date: Tue, 26 Jul 2022 15:55:01 +0200 Message-Id: <20220726135506.485108-2-bchihi@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220726135506.485108-1-bchihi@baylibre.com> References: <20220726135506.485108-1-bchihi@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 Signed-off-by: Ben Tseng Reviewed-by: Matthias Brugger Signed-off-by: Balsam CHIHI --- 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