From patchwork Tue Jun 25 21:32:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raphael Gallais-Pou X-Patchwork-Id: 13712068 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 267EBC30653 for ; Tue, 25 Jun 2024 21:33: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:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zmhey6jWNgkoZcPsesEc/YC3gENWDbb7EazMCNZY/50=; b=CvYI0oHtUY54RnnWNbDgMVT/Kd kOubN1nPuZwFfnXLQi0RmJmhqGurWroFOk+iZNwesxx+5xE5DjH0wRWW99qOsHQDYjeWyNet7e+Hh va1tXFgMjTc8ZThrLUPRM1ceLljMBzYUuLccSYiort3fWFvb83q5x5XM4ijDxlqnfIJlMiOu8DzuU 9PW3qwduuJOIzkeVo5c/delAkKv6ojF86tWZ/8FT56Lhd6QudOqf8MyV80YkEBU69CBLKLQVjKgPP XlSoy7IVj8Gq8DBkNA4wfn3pZ587ybG/S8hoXeDsgDeLAkIkBF1rwynH8LOjDZUMbnJ48lBJbcJgN mmWv2/ow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMDn9-00000004aE9-1oje; Tue, 25 Jun 2024 21:33:31 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMDmv-00000004aAZ-0rw5 for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2024 21:33:19 +0000 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4217d808034so49089575e9.3 for ; Tue, 25 Jun 2024 14:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719351195; x=1719955995; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zmhey6jWNgkoZcPsesEc/YC3gENWDbb7EazMCNZY/50=; b=eW9cmdQ1HupW2WapNrc/e9qW7BOpaBfBhErrgIRmEFyStV5By01erUnZY16M36/Suw iXhPePimiGnYC2zZ7OZ3iANdyKUp2hsDFf9NNqQV6Z8Az+NCbeLxzlTPZ/aZz5fAYl2P SJ/aIpAFr+FFNbl3UXE7pK9DT8Wm1v4+RI9E3QFls5PRCXTqsWXXMcQrrqJU4pzsrg7S bQkanjY15yq035eJHsHowwzmPHyRW9hg6v/r0Ae8UPQtzU1X3lLQxddCOPRgDRhzML63 DJwokqGHKT4EMXyuiCak0x8PcWg2Sfc5pjh6l0IJBiunEpoam07Lz8nXi/5qPoxfDiIz Rwiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719351195; x=1719955995; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zmhey6jWNgkoZcPsesEc/YC3gENWDbb7EazMCNZY/50=; b=oBR1gMd+2aJTyAKo6usXMecIiEouuONkvIFZL+NwNOyZYCjnyVU2POGh+XV54+xNrd HLFnuFBmVRNEqhdVXwOU2BalFzvbVXGfoIiewZwTABWaRdnKrvMWxyWrWfHz2x6I11O/ 387GCrHkpDn3g4tq2q5HrQDclKoZx//WRoRLDlZ5YyJSZ9hEHRpgTU88VWt+0XK0+nfb y1oY2inJNNqlkC6LUeM4y7y6rrKoVo0KpLWCpHFf8lIIepGx/9Mmz1LOXZzUpCEMOAUJ wl8Gye6ODlZFc4o9NwG2pSOA5NFfNe5JDppOVQoDOg1EJGpWTVuUxN9N8de9ympC4DyU zDHA== X-Forwarded-Encrypted: i=1; AJvYcCVgGIgPXTcU2pc0WHA1GI/ftAYltsh/JYl0t3C3osjCnvZzoYUCl74GOXdAWcQpJi9wYONDcE+uf7+VRQP6PpPxwvyIJo1OIkVN7i5WxT+DMXAZsYo= X-Gm-Message-State: AOJu0YzlxOpcIk/ybJDSwTD+zFy55yQK1NcK0mH0WnZfweMECyokyIp3 tJ0TCVSL3ou/M7huOTm3pzBeBse3WIVpza+ZZX08TT3QxOoCw16K X-Google-Smtp-Source: AGHT+IHZcYPdA/oB1eqxXUZJdRHrdM0ptr8uZAvGcXG5QB+c4jay5cR1N2yLLu/ozoO9syYLBuFxfQ== X-Received: by 2002:a5d:518c:0:b0:362:3b56:dbda with SMTP id ffacd0b85a97d-366e9463e46mr5084476f8f.9.1719351194528; Tue, 25 Jun 2024 14:33:14 -0700 (PDT) Received: from localhost ([2001:861:3385:e20:6384:4cf:52c5:3194]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366e88c0c38sm9561633f8f.32.2024.06.25.14.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 14:33:14 -0700 (PDT) From: Raphael Gallais-Pou Date: Tue, 25 Jun 2024 23:32:41 +0200 Subject: [PATCH v2 2/3] thermal: sti: depend on THERMAL_OF subsystem MIME-Version: 1.0 Message-Id: <20240625-thermal-v2-2-bf8354ed51ee@gmail.com> References: <20240625-thermal-v2-0-bf8354ed51ee@gmail.com> In-Reply-To: <20240625-thermal-v2-0-bf8354ed51ee@gmail.com> To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Maxime Coquelin , Alexandre Torgue , Patrice Chotard , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org X-Mailer: b4 0.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240625_143317_290287_06E856DD X-CRM114-Status: GOOD ( 15.61 ) 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 Switch to thermal_of_zone to handle thermal-zones. Replace thermal_zone_device_register() by devm_thermal_of_zone_register() and remove ops st_thermal_get_trip_type, st_thermal_get_trip_temp. Signed-off-by: Raphael Gallais-Pou --- Changes in v2: - Remove unused struct thermal_trip trip --- drivers/thermal/st/Kconfig | 1 + drivers/thermal/st/st_thermal.c | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/thermal/st/Kconfig b/drivers/thermal/st/Kconfig index ecbdf4ef00f4..2d08147876ee 100644 --- a/drivers/thermal/st/Kconfig +++ b/drivers/thermal/st/Kconfig @@ -5,6 +5,7 @@ config ST_THERMAL tristate "Thermal sensors on STMicroelectronics STi series of SoCs" + depends on THERMAL_OF help Support for thermal sensors on STMicroelectronics STi series of SoCs. diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c index 5f33543a3a54..1f2ba5c88cbc 100644 --- a/drivers/thermal/st/st_thermal.c +++ b/drivers/thermal/st/st_thermal.c @@ -12,6 +12,7 @@ #include #include "st_thermal.h" +#include "../thermal_hwmon.h" /* The Thermal Framework expects millidegrees */ #define mcelsius(temp) ((temp) * 1000) @@ -135,8 +136,6 @@ static struct thermal_zone_device_ops st_tz_ops = { .get_temp = st_thermal_get_temp, }; -static struct thermal_trip trip; - int st_thermal_register(struct platform_device *pdev, const struct of_device_id *st_thermal_of_match) { @@ -199,27 +198,22 @@ int st_thermal_register(struct platform_device *pdev, polling_delay = sensor->ops->register_enable_irq ? 0 : 1000; - trip.temperature = sensor->cdata->crit_temp; - trip.type = THERMAL_TRIP_CRITICAL; - sensor->thermal_dev = - thermal_zone_device_register_with_trips(dev_name(dev), &trip, 1, sensor, - &st_tz_ops, NULL, 0, polling_delay); + devm_thermal_of_zone_register(dev, 0, sensor, &st_tz_ops); if (IS_ERR(sensor->thermal_dev)) { - dev_err(dev, "failed to register thermal zone device\n"); + dev_err(dev, "failed to register thermal of zone\n"); ret = PTR_ERR(sensor->thermal_dev); goto sensor_off; } - ret = thermal_zone_device_enable(sensor->thermal_dev); - if (ret) - goto tzd_unregister; platform_set_drvdata(pdev, sensor); - return 0; + /* + * devm_thermal_of_zone_register() doesn't enable hwmon by default + * Enable it here + */ + return devm_thermal_add_hwmon_sysfs(dev, sensor->thermal_dev); -tzd_unregister: - thermal_zone_device_unregister(sensor->thermal_dev); sensor_off: st_thermal_sensor_off(sensor); @@ -232,7 +226,8 @@ void st_thermal_unregister(struct platform_device *pdev) struct st_thermal_sensor *sensor = platform_get_drvdata(pdev); st_thermal_sensor_off(sensor); - thermal_zone_device_unregister(sensor->thermal_dev); + thermal_remove_hwmon_sysfs(sensor->thermal_dev); + devm_thermal_of_zone_unregister(sensor->dev, sensor->thermal_dev); } EXPORT_SYMBOL_GPL(st_thermal_unregister);