From patchwork Sat May 18 12:12:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Rapha=C3=ABl_Gallais-Pou?= X-Patchwork-Id: 13667600 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 E87E4C25B74 for ; Sat, 18 May 2024 12:13:20 +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:Cc:To:In-Reply-To:References:Message-Id :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=cug7jwc7dBD/9HFXDHjVwCHUKII08Ti3PjxFcjFmgaQ=; b=25LZIpbaOca0Ri nrFyOKlhvohawBOsiHD+KLCUP0z3RUwmZ1fkjX0OkQP+WEW4BIRpLsMRF7zApRLj+S+xfMhdHyvmm Z5hPAMkCRR2LsJRRjscVYiiK/mVNen0IpLX18Edlyd+XVKMCbVDS2M8VLqls1+dytb68CLiIugaIN +jHP9ILJmXUqdSVeR6Yqioauzx/iJOaVTlZ35/p0G5OKVpdLzXdAdBZmXLJkgfsZmbNvVbj9LAhKH eNM68FhcEKhUanIwKzbaR8iw2Wt1T1KPHEIhfHCroJqZV80cOW1odzF6aRS3hA+I+Y0ww8LlDhZBJ XxNzyNwM03Nfe0KHKi1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s8Iw2-0000000A2Ue-10UH; Sat, 18 May 2024 12:13:10 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s8Ivo-0000000A2Q7-2kKi for linux-arm-kernel@lists.infradead.org; Sat, 18 May 2024 12:13:00 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4202959b060so8251145e9.2 for ; Sat, 18 May 2024 05:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716034371; x=1716639171; 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=IGJsrqgkoxohMyaFQCRQCQrzlTAn771GcCI5VxzoLbQ=; b=FrpEnv/BtiZaiPMNJWQgBcPfN2fjGgbKYk3Q9FHh1RsGD32SwtVCx+tTbmfot81CYy 0t/mj3XOVAIpIaBk8+FP501LEHLrJnxjTf6HXlgBcBAqTP27/lj0VATSYia5lcW4Vwdj /zpCeysjKgXsc95YJeKCFojC8W4WkWiQjXOdD8U+VMJ0MTZR1Uc2pNPvaC+okEewKGF7 BrCOzd06MG1kBxt6wTxQOELBL3z5BNz5TSoXLr1dGvzzeEZSBYXmlrWHlYY8kCUjm7Ls IlgG4LmFhMgGtYeUEb1HLQvTO/bB9TkCGSLccgw4dNEVPoM4bFBlsbOq4VjCmlq1N9+4 YPnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716034371; x=1716639171; 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=IGJsrqgkoxohMyaFQCRQCQrzlTAn771GcCI5VxzoLbQ=; b=X2M4s26T95D4vO4JVnceyJzDgsX7FLG6yOabD9SfdxV9XyvkJEA24iqqS7M4ukonCe FHLQOK+O+mJerrxv2zergp3a0XW0UvRe0bWZ18WosJ0VTVlvsyXzH5P9/58D+Tom1/OE ACfH65E58ctuh5+momGFje8gb4svIOGZwSBU8nAVzeLEMOQOUoJNqaS0r19F0DMxZrej C7eyiaGS+ViVkbGjfk1oYZVP/TCOjLN+A8PFbIFfyH9UkVvlWJz+vOAKPDpJSnulGUW2 qnwReb0f9EWTpvivrySi/aSQw76D+Pc53j0z+LaOOQk0xs8jNfcKMqtjikbZaqF5fWRs S9Kg== X-Forwarded-Encrypted: i=1; AJvYcCWkPuktLU7NFPYPgXyrlC4a80Oq2QZ5imbF/z3MM95PR8pHiOJS8rZwDVB/v1INChoa6yEeBJmP1C4TtS0efAWOwfaAOOwTF4QtWSjN+ZthKxmtvuc= X-Gm-Message-State: AOJu0YyaEAoL6o4m/Fx/qGNDEXQKK4mypAwdNfBgTSviDYHsjF9cuRWF 4sdMWYl1PpHsEEQRIx+YrhtLqorE+ORnB2wotZTE5l9tDp0MBi2n X-Google-Smtp-Source: AGHT+IE/IhYubC0E9IZHEWKwQe0B3qG0jCm6OSbLvY0zrTBrXxj/mkuhSbi+Le/nYtJXLiXMiTQwEw== X-Received: by 2002:a05:600c:3144:b0:420:1db0:53c1 with SMTP id 5b1f17b1804b1-4201db054a9mr89916045e9.41.1716034370365; Sat, 18 May 2024 05:12:50 -0700 (PDT) Received: from localhost ([2001:861:3385:e20:6384:4cf:52c5:3194]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42017166c64sm215580105e9.8.2024.05.18.05.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 May 2024 05:12:50 -0700 (PDT) From: Raphael Gallais-Pou Date: Sat, 18 May 2024 14:12:05 +0200 Subject: [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem MIME-Version: 1.0 Message-Id: <20240518-thermal-v1-2-7dfca3ed454b@gmail.com> References: <20240518-thermal-v1-0-7dfca3ed454b@gmail.com> In-Reply-To: <20240518-thermal-v1-0-7dfca3ed454b@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.13.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240518_051256_838275_9BE2CDC7 X-CRM114-Status: GOOD ( 14.42 ) 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 --- drivers/thermal/st/Kconfig | 1 + drivers/thermal/st/st_thermal.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 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..60e70de724d4 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) @@ -203,23 +204,21 @@ int st_thermal_register(struct platform_device *pdev, 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 +231,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);