From patchwork Thu Feb 9 10:56:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balsam CHIHI X-Patchwork-Id: 13134445 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F931C61DA4 for ; Thu, 9 Feb 2023 12:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1DfWVQI+p31oTpucyeN2PJY4J2Phe2+fsCo3J0S9FLo=; b=O6Ul0Lal3iuGFk QfbAyXEEQe1KJczKoZi/DEp2BRAXPgFlOMDFaE83ZNCwC/vzBUK2NXRhIQJtw8VNsNPuh80SIJisc Slag/eA7/VOlEJpy3vkF2C5NYzsWNABa7cXQheyfMRkgQEU7Wl8jlxz3+7MV82sPVWEKoqspbhNF4 5nPFEGj67XuBZ8X9iBb48B/q1lG3Ue3gdsiFrNb2eMCMRDWY9h5/4bJ2ITZ8ZOizoohjB0NJuWunz IRf0+RB4F8BGRHI59fW1eh+oF37Q6BG2VWiVoKEdVraZSZwxf1EkgXwhnmWlJr5md3MOVUk/wUO7v 2ynJaRl5pkz30sD9s2iA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQ5bg-001QQ1-Bf; Thu, 09 Feb 2023 12:00:52 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQ4bV-00162E-A9 for linux-arm-kernel@lists.infradead.org; Thu, 09 Feb 2023 10:56:41 +0000 Received: by mail-wm1-x331.google.com with SMTP id o36so1152186wms.1 for ; Thu, 09 Feb 2023 02:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wq9pZMnWBZTTW+YQ8VEhTPj9+xeNQ66KGbtah/GLk0c=; b=oYCQA0P8JLrHPndLtXA+DcSAQtW/lIXDXvL7lRZZYg99LjHYAorVj+laJuH3JCgTPq 0Qd5MhOsiktdAemybNO4ZhV/z2T56pymExHmxlAqFX0fjZfrtlhlgXC9IjDs8PgkESaM IzgVyltMxQpKrQJGUj0Th+/PFeyhXLabc+QC07bwZTXn24GoYppETHThRP0uR7plEt8W y8LnNbNuwZKShaKPc51JuaEq7YeIDYTIDyM7X4a/kvtZJzWQcBeKzZkVyN6b1LOmgIn7 GV3JOdM8C370/e9raiMKSzf9DhiDu+01CMRdD5bRI+nM3aCP7+wzE49DUnCADZNHGHFv 1aNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wq9pZMnWBZTTW+YQ8VEhTPj9+xeNQ66KGbtah/GLk0c=; b=7LUXwrkl8PJDANh6soS7wWhS2IwUDbC6dMl7jQAgtDtejdvWcxqWFbPn7i2qfvJxgK BaoBCHLGSHZ4YrXIPo+8v8uCYZOxEN8+HDjXXT+27jyaG5izkjYIA/z8X8P3+Vojqd6f 7nmbhnHEXWWIbQqr+DU9qWCSpRc0X0z/kX9rYiVuZ3+v5/HUc0ztc81ZCUNr7zd282i0 WIJ07md1tduYBCORXA0E7WfAhSWAaICWdXZ5j5dQGHcRMeXOt1NNlHFGL3StYIVESDnn fnBwi9/DMglO2wdHGzOZOEXTaMx8BBVGjX6dWhKfw/W7QWiC8yTaH9+Q5fsyWCvEK8qG kdZA== X-Gm-Message-State: AO0yUKV2g4ZYRZA9mi57NNs1LbDIeI604byLJ3UWGsooO5lCTS/wXaNE 7WmUNd10Zjv1Qn19zCPiwBZzsA== X-Google-Smtp-Source: AK7set/hGUZ6n4ODrWzj86rovtS+x/wz5cfSwsJ/mQLYFajeR8fwFmw7FTpAPci6bclybcJShmBa2Q== X-Received: by 2002:a05:600c:1609:b0:3dc:53a2:2690 with SMTP id m9-20020a05600c160900b003dc53a22690mr9560272wmn.7.1675940192714; Thu, 09 Feb 2023 02:56:32 -0800 (PST) Received: from t480-bl003.. (185.173.185.81.rev.sfr.net. [81.185.173.185]) by smtp.gmail.com with ESMTPSA id j37-20020a05600c1c2500b003daf6e3bc2fsm9140466wms.1.2023.02.09.02.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 02:56:32 -0800 (PST) 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 v14 1/6] thermal: drivers: mediatek: Relocate driver to mediatek folder Date: Thu, 9 Feb 2023 11:56:23 +0100 Message-Id: <20230209105628.50294-2-bchihi@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230209105628.50294-1-bchihi@baylibre.com> References: <20230209105628.50294-1-bchihi@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230209_025637_691798_1F04D893 X-CRM114-Status: GOOD ( 17.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Balsam CHIHI 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 Reviewed-by: AngeloGioacchino Del Regno --- 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 e052dae614ebb..d35f63daca3b7 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 2506c6c8ca83a..766ce38ff4f33 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -55,7 +55,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 0000000000000..7558a847d4e92 --- /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 0000000000000..53e86e30b26ff --- /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 8440692e3890d..b4ef57fa9183e 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mediatek/auxadc_thermal.c @@ -23,7 +23,7 @@ #include #include -#include "thermal_hwmon.h" +#include "../thermal_hwmon.h" /* AUXADC Registers */ #define AUXADC_CON1_SET_V 0x008