From patchwork Thu Jan 12 15:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balsam CHIHI X-Patchwork-Id: 42506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3950477wrt; Thu, 12 Jan 2023 07:40:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXuEw5uvFX5ckdH2yvPqGFxSYHqaAy/HudZCYOjjV9mZQCo+Ur+EAsUGQ/S7EAqbfUWul/ER X-Received: by 2002:a17:906:6881:b0:84d:4d6c:a462 with SMTP id n1-20020a170906688100b0084d4d6ca462mr11737563ejr.25.1673538031916; Thu, 12 Jan 2023 07:40:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673538031; cv=none; d=google.com; s=arc-20160816; b=F6XX4Tb+Y2Ldd2spVM1b/+7qcXq9MrTGOD6LYlztAIB8B0iufm+M97GZEZgYS5B1Gk e4fdJIHlet4ccp57rYZup/A9/abbCN6SKNcExWPL6M7JtiNOE/L7trC7oKsjboEAOXNF 84Oog5uG3pkJagytFA9IZ+MNQo6xDKvNQjYITYzMPpPB9lkFt7LMrEubSrc8VpgKll/r SNCuQdKV0RLOV1Edsi3CN8inrq8K4EBnB6fRyVI//QQ3MFWWeXpup3VcBcZn0Xsuxp8F yhqA4zOCFgI+fXfY8twLxl4jWu9dn+8NHddOTlrBsEjHPoAZ3MTHn4vPl3GnkGlHbRCM vm4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6VSnhqLrpT6kDXZFeOhmvYh0g128g6QipzNoayDzA2s=; b=zwqkUT+dveFQmGHIG3NrLbpuWBwq7ZFXmACVruE2EYKlLWbk4Fou3myURJ2dI68THM P2jExie6/RcLJ25TiPlJxh365Exgart/xv2nsfMPM2wbhQ/t53RrW8Fx8DbkpStTU0nZ IqzNYPK6b0m6xbdEN8JMW1utDBs2XpVzEUUIuYhSf42sjP3as/wzNlSvQFQjnvwaYoYZ 87lRLoRTBrcWeki5xAnD/nheUl3II5HXiwGVpFpuJkbOkKq5ICbvz82M5wLhhAd+RjYJ GpPoluAkoEYdd4MVRPZkvYv5/bbFxKpl54u2adU2zh/uugzTfNSSKrvj9YX92u7a+XLB X+uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=6M9RLTA5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw4-20020a170906478400b007c14afc0ecdsi18251723ejc.479.2023.01.12.07.39.44; Thu, 12 Jan 2023 07:40:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=6M9RLTA5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240501AbjALPjU (ORCPT + 99 others); Thu, 12 Jan 2023 10:39:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240560AbjALPin (ORCPT ); Thu, 12 Jan 2023 10:38:43 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 329ED48CDF for ; Thu, 12 Jan 2023 07:29:55 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id h16so18442729wrz.12 for ; Thu, 12 Jan 2023 07:29:55 -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=6VSnhqLrpT6kDXZFeOhmvYh0g128g6QipzNoayDzA2s=; b=6M9RLTA5Z33oePTWgAfJnIQq8S7p/3hEE+PdOcvkwXq22q+OfT3/YVb7tx3hEhuBjf mDlcfxv3F0qqU0IWUty+rXELBSKB5EcFfqkPdWRyDHetmA5pFUg0RCLO9GDcw4SNecw4 yw7NcFGG0hG149TqHPat3QuzKPbIei5z7gNdVPNI6d+47K7vka6ZnE+MMCAjhN5wrqfE TKpEWj0AHGaqChjvXWbZ4d2AS3DpvgzRHdwepCJwYyPS4b3wuG+wwKuW/YCPeAbQOKIM Xtk1BvnTjDLjg/jD77Lx0necyYZH9PZgHdO/P4Mk4G6hrOFR+QOa2upVwNIwMjw+JNWQ LwYg== 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=6VSnhqLrpT6kDXZFeOhmvYh0g128g6QipzNoayDzA2s=; b=42760dXHYVaODXvs5qFmyi3RpoA+TIKhTSOrrd9mmsgrpdCwWACXxl56TDH4Nlo3+U SEqicLJG64CKDAq3Ud51gy4eXWCW8cZnzP2P8YbwZRqRU+8Xwh0dEfy+3d1X15h7BFHC KyvEUbzbBEOTpjewS5db+lJyocRylxhLrYTPMvpqZwnC2ceVc9mlSqdAfDjEBwWCX1Uv k3T/XL1171xux+t7MP8JnrPZy4f4K5pgH1nrcQ70+I+VEXSYBTciijLoLRWOrNer/2aI c1UZU6EZ0ouKyiXLMvT91afRdRN80bW8SrPwaoDcl20VQeIsQBvbiH9uKOP0HpfvxLfR Qpag== X-Gm-Message-State: AFqh2kr30cE9TeyOlr2p1T74PFKftTjJqFHEgtUZd0QrQINlHQ/4dosj gM9cZ5qyMbgXJw7pPrcDs5pONw== X-Received: by 2002:adf:e6ce:0:b0:293:1089:d6a with SMTP id y14-20020adfe6ce000000b0029310890d6amr29501933wrm.39.1673537393977; Thu, 12 Jan 2023 07:29:53 -0800 (PST) Received: from t480-bl003.civfrance.com (58.188.158.77.rev.sfr.net. [77.158.188.58]) by smtp.gmail.com with ESMTPSA id l24-20020a1ced18000000b003d99da8d30asm26395909wmh.46.2023.01.12.07.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 07:29:53 -0800 (PST) From: bchihi@baylibre.com To: daniel.lezcano@linaro.org, rafael@kernel.org, amitk@kernel.org, rui.zhang@intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, khilman@baylibre.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, james.lo@mediatek.com, rex-bc.chen@mediatek.com Subject: [PATCH v10 1/6] thermal/drivers/mediatek: Relocate driver to mediatek folder Date: Thu, 12 Jan 2023 16:28:50 +0100 Message-Id: <20230112152855.216072-2-bchihi@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230112152855.216072-1-bchihi@baylibre.com> References: <20230112152855.216072-1-bchihi@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754831815170220003?= X-GMAIL-MSGID: =?utf-8?q?1754831815170220003?= 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 --- 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 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 2506c6c8ca83..766ce38ff4f3 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 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 8440692e3890..b4ef57fa9183 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