From patchwork Thu Jul 13 22:41:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaghathiswari Rankappagounder Natarajan X-Patchwork-Id: 9839681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CCA81602D8 for ; Thu, 13 Jul 2017 22:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A08527FB0 for ; Thu, 13 Jul 2017 22:41:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1E0528113; Thu, 13 Jul 2017 22:41:41 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 8A2CC27FB0 for ; Thu, 13 Jul 2017 22:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753197AbdGMWlZ (ORCPT ); Thu, 13 Jul 2017 18:41:25 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:35806 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbdGMWlX (ORCPT ); Thu, 13 Jul 2017 18:41:23 -0400 Received: by mail-pg0-f42.google.com with SMTP id j186so36145514pge.2 for ; Thu, 13 Jul 2017 15:41:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hP738uRCr3kio1slxby8HLVgc1KUwmgElzbmBa/brtI=; b=tKbJLdJfCIAQU3ikIPurofRJXSkDiz2Smst7JipjrqjTDd6TVqw3qmXLl1jYS67xj+ 6L3hEwHCHsdThJIPVWHIiw6kLYU4mmhHai6W2Y6Jgs/TcQYkSSA+Hu9kArGYFALSTbl4 lGPhgsR8bYGzpWj+cluPiNCGWQyPSsu7XW/KI1ql0dsNwQnD67HaoGvYPp45KUBXxU/o bHo/v0RLYIc6TUgL5ivahC0QL/g3gZPf4/HzMgpm5+dh9+TsCsKAbx5rCRfVjs/jNBaW zHKDsz9Qe3whx8lF3TalgicoanoVS9mglonTjPkKyZ3O26hBQaQSyLWo5Xkonb7EHzdb 5kBA== 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:in-reply-to :references; bh=hP738uRCr3kio1slxby8HLVgc1KUwmgElzbmBa/brtI=; b=ebS99xJKIUgGKGYypbVyPmfpes+OzQFw2Yv+ZNvYUTBOCx2v/Nb0nb8RfqNYf5Oq4H a46ilzvyyisr2Kp+xixvnxfXw+3s6ilMyGetJ3XRE6W49/VesPJqXUzgIO97fCCCGfxL NmR4N82OdT6XAzN3+8ggEQmI6ztsfBXc4BjsXI+f5j0F8ojrmlFnS3BVZjXwWnhphsou cJT9cRH4t0B80dJOr74/JtkIW6ZgeAznqLTyysXbvbSYGc5xTD9kjKFT4M9I/TMwExXY 7BSBo/u+KhvMwymo3GMHJsWjcTiadu/EzAzf9dkV57vU3+CDfVfFxFJUbB2POlHQZY4U aVpg== X-Gm-Message-State: AIVw1102e/BK6kEYLZJ8Uwd/5fpnYv1xnAcKnJmfd1sfCP2PH0gPPiwn YsWdUXshaqil92su X-Received: by 10.98.47.194 with SMTP id v185mr1983377pfv.62.1499985677874; Thu, 13 Jul 2017 15:41:17 -0700 (PDT) Received: from jaghu22.svl.corp.google.com ([100.123.242.38]) by smtp.gmail.com with ESMTPSA id h90sm17149260pfh.133.2017.07.13.15.41.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Jul 2017 15:41:17 -0700 (PDT) From: Jaghathiswari Rankappagounder Natarajan To: zbr@ioremap.net, linux-kernel@vger.kernel.org, linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org, gregkh@linuxfoundation.org Cc: Jaghathiswari Rankappagounder Natarajan Subject: [PATCH linux v4 3/3] drivers: w1: add hwmon temp support for w1_therm Date: Thu, 13 Jul 2017 15:41:07 -0700 Message-Id: <20170713224107.12789-4-jaghu@google.com> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog In-Reply-To: <20170713224107.12789-1-jaghu@google.com> References: <20170713224107.12789-1-jaghu@google.com> 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 change adds hwmon temp support for w1_therm. Signed-off-by: Jaghathiswari Rankappagounder Natarajan Acked-by: Evgeniy Polyakov Acked-by: Guenter Roeck --- v2 - make changes to support hwmon_device_register_with_info mentioned by Guenter. v3 - used IS_REACHABLE() - rearranged the code to not require forward declarations - used family_data - incremented the reference count with the bus mutex locked - corrected indentation - removed dev_warn message - simplified returning mode - removed write function v4 - used W1_CHIP_INFO - corrected formatting drivers/w1/slaves/w1_therm.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) -- 2.13.2.932.g7449e964c-goog -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 64e6a8f38410..c99886ac1dbf 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "../w1.h" #include "../w1_int.h" @@ -118,19 +119,72 @@ static struct attribute *w1_ds28ea00_attrs[] = { &dev_attr_w1_seq.attr, NULL, }; + ATTRIBUTE_GROUPS(w1_therm); ATTRIBUTE_GROUPS(w1_ds28ea00); +#if IS_REACHABLE(CONFIG_HWMON) +static int w1_read_temp(struct device *dev, u32 attr, int channel, + long *val); + +static umode_t w1_is_visible(const void *_data, enum hwmon_sensor_types type, + u32 attr, int channel) +{ + return attr == hwmon_temp_input ? 0444 : 0; +} + +static int w1_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) +{ + switch (type) { + case hwmon_temp: + return w1_read_temp(dev, attr, channel, val); + default: + return -EOPNOTSUPP; + } +} + +static const u32 w1_temp_config[] = { + HWMON_T_INPUT, + 0 +}; + +static const struct hwmon_channel_info w1_temp = { + .type = hwmon_temp, + .config = w1_temp_config, +}; + +static const struct hwmon_channel_info *w1_info[] = { + &w1_temp, + NULL +}; + +static const struct hwmon_ops w1_hwmon_ops = { + .is_visible = w1_is_visible, + .read = w1_read, +}; + +static const struct hwmon_chip_info w1_chip_info = { + .ops = &w1_hwmon_ops, + .info = w1_info, +}; +#define W1_CHIPINFO (&w1_chip_info) +#else +#define W1_CHIPINFO NULL +#endif + static struct w1_family_ops w1_therm_fops = { .add_slave = w1_therm_add_slave, .remove_slave = w1_therm_remove_slave, .groups = w1_therm_groups, + .chip_info = W1_CHIPINFO, }; static struct w1_family_ops w1_ds28ea00_fops = { .add_slave = w1_therm_add_slave, .remove_slave = w1_therm_remove_slave, .groups = w1_ds28ea00_groups, + .chip_info = W1_CHIPINFO, }; static struct w1_family w1_therm_family_DS18S20 = { @@ -559,6 +613,38 @@ static ssize_t w1_slave_show(struct device *device, return ret; } +#if IS_REACHABLE(CONFIG_HWMON) +static int w1_read_temp(struct device *device, u32 attr, int channel, + long *val) +{ + struct w1_slave *sl = dev_get_drvdata(device); + struct therm_info info; + u8 fid = sl->family->fid; + int ret; + + switch (attr) { + case hwmon_temp_input: + ret = read_therm(device, sl, &info); + if (ret) + return ret; + + if (!info.verdict) { + ret = -EIO; + return ret; + } + + *val = w1_convert_temp(info.rom, fid); + ret = 0; + break; + default: + ret = -EOPNOTSUPP; + break; + } + + return ret; +} +#endif + #define W1_42_CHAIN 0x99 #define W1_42_CHAIN_OFF 0x3C #define W1_42_CHAIN_OFF_INV 0xC3