From patchwork Thu Apr 18 16:28:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-Fran=C3=A7ois_Dagenais?= X-Patchwork-Id: 10907655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6A38F17E0 for ; Thu, 18 Apr 2019 16:28:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5357428CAC for ; Thu, 18 Apr 2019 16:28:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4794528D24; Thu, 18 Apr 2019 16:28:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF0F228CAC for ; Thu, 18 Apr 2019 16:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388346AbfDRQ25 (ORCPT ); Thu, 18 Apr 2019 12:28:57 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:37152 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725888AbfDRQ25 (ORCPT ); Thu, 18 Apr 2019 12:28:57 -0400 Received: by mail-qk1-f196.google.com with SMTP id c1so1503149qkk.4 for ; Thu, 18 Apr 2019 09:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ThBOgdyTXks5DuLbT4kkqQscnVJnU1x3gFAh1lNO90w=; b=cWg9ncZkCEgwbml66V+pvd7/8kjhNaUis9FbyHBz/79In5lfPp28bIKpdoWhrTdeBz HkS7pzmUqJz0+le7SVLFVKzUrQorBWTTcauq2fQWzKU7XdKCFEm1cW8dRsTdYjEKQW8n Yyc9JFz1rdU8z+b5nkG3lErgvGR6vi+puI7+WPpvXFKLf4vV78aZB7AXg5pqbjjYiAhD AKmI6JgsjgGcN4TtxKckXdNHtaFHFm2GLs4jcQB5MUpQTuuQiDcSBAhEcVviByKyBwS/ q64MG/Col9l+zXlCyO7vgyC6yzDOuR0RU4EhO/gCXydGiVn5H+c4YzMz+tvYeA6nHOsT 7RiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ThBOgdyTXks5DuLbT4kkqQscnVJnU1x3gFAh1lNO90w=; b=uiBp7r0Q03p7UHTyRLYRerIgmf7SVJ2XL0KuN5bbybslWrrqTwt44ndRtNfJvPNQyq 0KWERehzE2kvqD9YCdCpmvBS/JDPQh6ClprE1cYPT9FxYtRbiSHG3JXuONg02FTFU5Oz 9zv7cvPKEB2kjyZMLKIJGBJ3SOk8IVIAD0OsFG61pvcF0nKRcOGcYYaKZUc3TQkJCqQV Cbt8Q9fIi0zCLR2D6a5SwRupbJ+P7YxVYnBs0DpgKEOlUBsUQDFY4j5FNo8p0DhhbPy/ o+NYk0ido9f7fhOaRKUXSVLKHU6rCP7LxbUn6VXi004aazUflH63c4ipUY4E8OGKhwiI H2eg== X-Gm-Message-State: APjAAAVfXidK4OZd865IIxiq0FvawLKAnQRoyaRT04ppzTjyeNvIHeDm KghmeljSBnJkPIExkkE9O/5+v+v1NlKSgw== X-Google-Smtp-Source: APXvYqzCPPnsnA6bmBKaOhNKPulWlL8zO6daXSDN7nzXf6ha9d72VyqLP+tt/J5GYHRF5WNUjMJg+Q== X-Received: by 2002:a37:f511:: with SMTP id l17mr74209851qkk.296.1555604935542; Thu, 18 Apr 2019 09:28:55 -0700 (PDT) Received: from jfddesk.Sonatest.net (ipagstaticip-d73c7528-4de5-0861-800b-03d8b15e3869.sdsl.bell.ca. [174.94.156.236]) by smtp.gmail.com with ESMTPSA id n184sm1186906qke.29.2019.04.18.09.28.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 09:28:54 -0700 (PDT) From: Jean-Francois Dagenais To: linux-hwmon@vger.kernel.org Cc: jdelvare@suse.com, linux@roeck-us.net, Jean-Francois Dagenais Subject: [PATCH] hwmon: max6650: add thermal cooling device capability Date: Thu, 18 Apr 2019 12:28:34 -0400 Message-Id: <20190418162834.14995-1-jeff.dagenais@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This allows max6650 devices to be referenced in dts as a cooling device. The pwm value seems duplicated in cooling_dev_state but since pwm goes through rounding logic into data->dac, it is modified and messes with the thermal zone state algorithms. It's also better to serve a cache value, thus avoiding periodic actual i2c traffic. Signed-off-by: Jean-Francois Dagenais --- drivers/hwmon/max6650.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c index 61135a2d0cff..1b8efbb8adbf 100644 --- a/drivers/hwmon/max6650.c +++ b/drivers/hwmon/max6650.c @@ -40,6 +40,7 @@ #include #include #include +#include /* * Insmod parameters @@ -113,6 +114,7 @@ module_param(clock, int, 0444); struct max6650_data { struct i2c_client *client; const struct attribute_group *groups[3]; + struct thermal_cooling_device *cooling_dev; struct mutex update_lock; int nr_fans; char valid; /* zero until following fields are valid */ @@ -125,6 +127,7 @@ struct max6650_data { u8 count; u8 dac; u8 alarm; + unsigned long cooling_dev_state; }; static const u8 tach_reg[] = { @@ -694,6 +697,63 @@ static int max6650_init_client(struct max6650_data *data, return 0; } +#if IS_ENABLED(CONFIG_THERMAL) +/* thermal cooling device callbacks */ +static int max6650_get_max_state(struct thermal_cooling_device *cdev, + unsigned long *state) +{ + *state = 255; + dev_notice(&cdev->device, "%s %lu\n", __func__, *state); + return 0; +} + +static int max6650_get_cur_state(struct thermal_cooling_device *cdev, + unsigned long *state) +{ + struct max6650_data *data = cdev->devdata; + + *state = data->cooling_dev_state; + + return 0; +} + +static int +max6650_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) +{ + struct max6650_data *data = cdev->devdata; + struct i2c_client *client = data->client; + int err; + + state = clamp_val(state, 0, 255); + + mutex_lock(&data->update_lock); + + if (data->config & MAX6650_CFG_V12) + data->dac = 180 - (180 * state)/255; + else + data->dac = 76 - (76 * state)/255; + + err = i2c_smbus_write_byte_data(client, MAX6650_REG_DAC, data->dac); + + if (!err) { + max6650_set_operating_mode(data, state ? + MAX6650_CFG_MODE_OPEN_LOOP : + MAX6650_CFG_MODE_OFF); + data->cooling_dev_state = state; + } + + mutex_unlock(&data->update_lock); + + return err < 0 ? err : 0; +} + +static const struct thermal_cooling_device_ops max6650_cooling_ops = { + .get_max_state = max6650_get_max_state, + .get_cur_state = max6650_get_cur_state, + .set_cur_state = max6650_set_cur_state, +}; +#endif + static int max6650_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -709,6 +769,7 @@ static int max6650_probe(struct i2c_client *client, return -ENOMEM; data->client = client; + i2c_set_clientdata(client, data); mutex_init(&data->update_lock); data->nr_fans = of_id ? (int)(uintptr_t)of_id->data : id->driver_data; @@ -727,7 +788,34 @@ static int max6650_probe(struct i2c_client *client, hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, data, data->groups); - return PTR_ERR_OR_ZERO(hwmon_dev); + err = PTR_ERR_OR_ZERO(hwmon_dev); + if (err) + return err; + +#if IS_ENABLED(CONFIG_THERMAL) + data->cooling_dev = + thermal_of_cooling_device_register(client->dev.of_node, + id->name, data, + &max6650_cooling_ops); + if (IS_ERR(data->cooling_dev)) { + err = PTR_ERR(data->cooling_dev); + dev_err(&client->dev, + "Failed to register as cooling device (%d)\n", err); + return err; + } + + thermal_cdev_update(data->cooling_dev); +#endif + return 0; +} + +static int max6650_remove(struct i2c_client *client) +{ + struct max6650_data *data = i2c_get_clientdata(client); + + thermal_cooling_device_unregister(data->cooling_dev); + + return 0; } static const struct i2c_device_id max6650_id[] = { @@ -743,6 +831,7 @@ static struct i2c_driver max6650_driver = { .of_match_table = of_match_ptr(max6650_dt_match), }, .probe = max6650_probe, + .remove = max6650_remove, .id_table = max6650_id, };