Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp301681imn; Thu, 4 Aug 2022 06:39:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR6IasBCV4z9IUB4iPxSljGVCbP9H5JUsabLbg+GT+fwhF5Sv7Z+vakjygfDoMZwdWfEpRv7 X-Received: by 2002:a17:907:1c8c:b0:72b:6b8f:4add with SMTP id nb12-20020a1709071c8c00b0072b6b8f4addmr1470347ejc.556.1659620365729; Thu, 04 Aug 2022 06:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659620365; cv=none; d=google.com; s=arc-20160816; b=MmZJiwiHjz7XVaK/lAOBz0ejmLD9tE2JbCdId/EzRUkJZahASxhhPTxtyIjNqcHHpj HV78MigXw9BgT3ntp3+zQSVB7bj2Z2vEY9amlN4I43z2TMgAgBAc3zFly0sOErqKxboX HnSuvaEjj3sZjE2EeKxWa6Z009VxnqPsPkhDzzKJr1n09RNMOLaR+2Ti2a4mo1WX7qqZ szmMnFpV0MuogCzgt9aIFGpR7q6dx9u1fL4PjRSEu+Sf2D8GAM0FRanxFgBIcj7hLYag Ht2ROUxt5XGzRp0I81GH7+5NPxlN66OZxssAPm/Gv83b0m8UVk+Q0fTjza0BQBci9DDm FbXA== 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=qQK3oz9qbEyhSdrl3bVOwNcv3E2dhXu4IVGnclR+410=; b=FthfB3fcXW6HOwbpR2BQZNXOkU03RstBk3FENkd/QV8s6MNXsUENgNJnLRRyG8pBQj HGXOB1zaIOCCtZCSE57GwrWUnA2lLDq2g/fy1BwJ/C9DQt96NCLKK/5egM1N0X2Snfbe T+ImR4Ot/VM+Pj5EZvsQ7scT6Nw5JJy69jWmyKIudhJIcQ5cbVqes4a1+8xWOxLYyeT/ SVm918HcM5tnyN1WIOMRT22tbXtSaljiL023KyVfXK4wO+9CMQt5WzkmA9WHysU4wkPp yZfSEjKKa/6da1vRm2JQiv2FMQeJFstLJxOn+d2qNOO1SLymofC57QBh9GA1NoGDvlzc JIhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b="vr2V+/90"; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dc24-20020a170906c7d800b0073042f0bd9csi793843ejb.795.2022.08.04.06.39.01; Thu, 04 Aug 2022 06:39:25 -0700 (PDT) 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="vr2V+/90"; 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 S239777AbiHDNKF (ORCPT + 99 others); Thu, 4 Aug 2022 09:10:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239613AbiHDNKA (ORCPT ); Thu, 4 Aug 2022 09:10:00 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7401319C04 for ; Thu, 4 Aug 2022 06:09:59 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 8-20020a05600c024800b003a2fe343db1so2318538wmj.1 for ; Thu, 04 Aug 2022 06:09:59 -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=qQK3oz9qbEyhSdrl3bVOwNcv3E2dhXu4IVGnclR+410=; b=vr2V+/907iDdlnruy3oQToaR/XfzjPvf1I8r6njjhSb5We2JXBTFSpXjdhgdhuNfIQ N6tVvfvbwormefx89zs9dso8FCwkmNIrVtuB7VcJE6msdYBZU77/6XDdKGeMSR24Ojfy b68X2iJtRHY0/FXzxwb7gVrvSm8ZGqAstptPsUlBWVnKCyufHMMDHVYFqfnRyc3CiNa6 yNleYhuM22fRPZf+6wl8eCBgKF+TOF7sLztPbBzwmMoYU1BjTLALh2RAIrl5ylhBiasi RHaK1gwfDFm3QBWJDHVlAi72fFMinOga3boV8oOh8/AaLcZ0X/2+S4dQH5Voj5HM652n jwiw== 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=qQK3oz9qbEyhSdrl3bVOwNcv3E2dhXu4IVGnclR+410=; b=yPdQvUR4RDzwW922q+qJaR/Mi9oNHIgLDbp913MFySMk5psutvLQdBLZjpEuJHylPH vvuRS6nvXCkobHHEijKlM5EYc6arU+aI0yYz08q+sDo00phNV0w29gAXHWXE1jqLNa+h ZXgCOmjnDhOWrxRYp1OYtMZoEDwbFPILqYQTancaeqRbkJLJpJtOE2UaGxL7eznzaLG4 FrU8RId9YdrI6C2CjizvoVM/ouAhTHHDDeVyFzH5fgHfNvvPLJSIWiuOq29MFJnCDbVf 0nwrOe/HXe2mhSUB15Pm2A3tLl2Ng6YRExVB0BZbXp61C53qVxujr3HhQpoEmWcf+KnM HsyQ== X-Gm-Message-State: ACgBeo1YWxsHbeCD1C9jZjouGcBKqJ29nuwEp4Vs+RkXCgrCS+EWWYdH 3J9ukUwUfveVGIE3vJQpPlGiJg== X-Received: by 2002:a05:600c:503:b0:3a3:29ec:cd0 with SMTP id i3-20020a05600c050300b003a329ec0cd0mr6067777wmc.63.1659618597960; Thu, 04 Aug 2022 06:09:57 -0700 (PDT) Received: from Balsam-ThinkPad-T480.. (235.163.185.81.rev.sfr.net. [81.185.163.235]) by smtp.gmail.com with ESMTPSA id o15-20020adfcf0f000000b0021d6a520ce9sm1156817wrj.47.2022.08.04.06.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 06:09:57 -0700 (PDT) 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 v8.1, 1/7] thermal: mediatek: Relocate driver to mediatek folder Date: Thu, 4 Aug 2022 15:09:06 +0200 Message-Id: <20220804130912.676043-2-bchihi@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220804130912.676043-1-bchihi@baylibre.com> References: <20220804130912.676043-1-bchihi@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 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 From: Michael Kao Add MediaTek proprietary folder to upstream more thermal zone and cooler drivers, relocate the original thermal controller driver to it, and rename it as "mtxxxx_thermal.c" to show its purpose more clearly. Signed-off-by: Michael Kao Signed-off-by: Ben Tseng Signed-off-by: Balsam CHIHI --- drivers/thermal/Kconfig | 14 ++++------- drivers/thermal/Makefile | 2 +- drivers/thermal/mediatek/Kconfig | 23 +++++++++++++++++++ drivers/thermal/mediatek/Makefile | 1 + .../mtxxxx_thermal.c} | 2 +- 5 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 drivers/thermal/mediatek/Kconfig create mode 100644 drivers/thermal/mediatek/Makefile rename drivers/thermal/{mtk_thermal.c => mediatek/mtxxxx_thermal.c} (99%) 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..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..592c849b9fed --- /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..c2b9a166fbef --- /dev/null +++ b/drivers/thermal/mediatek/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_MTK_SOC_THERMAL) += mtxxxx_thermal.o diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/mtxxxx_thermal.c similarity index 99% rename from drivers/thermal/mtk_thermal.c rename to drivers/thermal/mediatek/mtxxxx_thermal.c index ede94eadddda..60924f8f98e9 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mediatek/mtxxxx_thermal.c @@ -23,7 +23,7 @@ #include #include -#include "thermal_hwmon.h" +#include "../thermal_hwmon.h" /* AUXADC Registers */ #define AUXADC_CON1_SET_V 0x008 -- 2.34.1