From patchwork Wed Jul 12 21:41:18 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: 9837441 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 1912B60393 for ; Wed, 12 Jul 2017 21:41:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0798C28647 for ; Wed, 12 Jul 2017 21:41:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F07A928658; Wed, 12 Jul 2017 21:41:35 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 7328828647 for ; Wed, 12 Jul 2017 21:41:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754504AbdGLVle (ORCPT ); Wed, 12 Jul 2017 17:41:34 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:35198 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754215AbdGLVld (ORCPT ); Wed, 12 Jul 2017 17:41:33 -0400 Received: by mail-pg0-f49.google.com with SMTP id j186so19061296pge.2 for ; Wed, 12 Jul 2017 14:41:27 -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=/Vj2VMn0p3fplFnXfLH7UGyZ+OzB/cAgzeOzaYrhPZc=; b=G5hQ0tY+nXHg7mFzamefp3LU+AE/J3y6dQigyFMwd68WxpXGTgruGqOFUCEsmpOLAb B+IVNEuNdcPvzW7/aDYg/oDMCoULKY0oB48Fs38HaEi5/U9JKpze+ERXTGajBL6Ws8WH 19qyB2SbIMUjwGaJ4xGVw2hSq0N8V+ufyquKm/v+Qm2qmd0pWYGRBwEJx8VoijNvLCwK 2ijOzzrKFa9GJsNKOweWzvMoXDZphJG8gyknX1z2C2mRBtZaXWpqsqqWWRRhRSEnWZSR 2SsJ/EMk8eqM6Rl8TAfGvR6baegMO/CSgBT9sL1SuhrtkIVMd+R1S4GMjIsWPqUXQjOZ dntQ== 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=/Vj2VMn0p3fplFnXfLH7UGyZ+OzB/cAgzeOzaYrhPZc=; b=LpqpxU78JEYRbuECbQNpD5bLMDPc2Qc7ZfVaxIExEPx8a78C95tYeW2zSwNLndDCh9 SigKOBQTXRUDidOYt695/6SWDbiDNHrbu2imsxL9QIUoBUKFLAA5IbYfXL1BShVirULR QOS2dAyhy2ZAkvGQhVftRdnKb64zAuXvwywYl9AE4ekKUjSUNr4nBtxj2s4tuRMt1MA+ sUGiISgcNV1Oow7gXbTxhGDBxzpFxgDxPCPlbmNVrhysR5leW68LRunZTM/4niXn2bX/ 3uNel8zqDD3t7k/gAfFcL2ZNUNAPxT3QI3W2+AJwNR53EGeA1Y4Bwk7BUm9rTbegU8UL xoiQ== X-Gm-Message-State: AIVw1135nOvqzjb2Ak/mvVBq6vRDjgFOaLeLN5tYyzLOUEBgpC07sKvt P1eBZYHcc+u+jSEG X-Received: by 10.84.136.36 with SMTP id 33mr6293940plk.123.1499895687275; Wed, 12 Jul 2017 14:41:27 -0700 (PDT) Received: from jaghu22.svl.corp.google.com ([100.123.242.38]) by smtp.gmail.com with ESMTPSA id y192sm5515859pgd.38.2017.07.12.14.41.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jul 2017 14:41:26 -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 Cc: Jaghathiswari Rankappagounder Natarajan Subject: [PATCH linux v2 3/3] drivers: w1: add hwmon temp support for w1_therm Date: Wed, 12 Jul 2017 14:41:18 -0700 Message-Id: <20170712214118.4306-4-jaghu@google.com> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog In-Reply-To: <20170712214118.4306-1-jaghu@google.com> References: <20170712214118.4306-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 --- v2 - make changes to support hwmon_device_register_with_info mentioned by Guenter. drivers/w1/slaves/w1_therm.c | 117 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 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 88f4cc8c3908..147f9dfa13de 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,61 @@ static struct attribute *w1_ds28ea00_attrs[] = { &dev_attr_w1_seq.attr, NULL, }; + ATTRIBUTE_GROUPS(w1_therm); ATTRIBUTE_GROUPS(w1_ds28ea00); +static umode_t w1_is_visible(const void *_data, + enum hwmon_sensor_types type, + u32 attr, int channel); + +static int w1_read_temp(struct device *dev, u32 attr, int channel, + long *val); + +static int w1_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val); + +static int w1_write(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long val); + +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, + .write = w1_write, +}; + +static const struct hwmon_chip_info w1_chip_info = { + .ops = &w1_hwmon_ops, + .info = w1_info, +}; + 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_chip_info, }; 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_chip_info, }; static struct w1_family w1_therm_family_DS18S20 = { @@ -559,6 +602,80 @@ static ssize_t w1_slave_show(struct device *device, return ret; } +static int w1_read_temp(struct device *device, u32 attr, int channel, + long *val) +{ + struct w1_slave *sl = dev_get_drvdata(device); + u8 *family_data = sl->family_data; + struct therm_info info; + int ret; + + if (!sl->family_data) + return -ENODEV; + + /* prevent the slave from going away in sleep */ + atomic_inc(THERM_REFCNT(family_data)); + + switch (attr) { + case hwmon_temp_input: + ret = read_therm(device, sl, &info); + if (ret) + goto dec_refcnt; + + if (!info.verdict) { + dev_warn(device, "Read failed CRC check\n"); + ret = -EIO; + goto dec_refcnt; + } + + *val = w1_convert_temp(info.rom, sl->family->fid); + ret = 0; + break; + default: + ret = -EOPNOTSUPP; + break; + } + +dec_refcnt: + atomic_dec(THERM_REFCNT(family_data)); + return ret; +} + +static umode_t w1_is_visible(const void *_data, enum hwmon_sensor_types type, + u32 attr, int channel) +{ + umode_t mode = 0444; + + switch (attr) { + case hwmon_temp_input: + break; + default: + mode = 0; + break; + } + return mode; +} + +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 int w1_write(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long val) +{ + switch (type) { + default: + return -EOPNOTSUPP; + } +} + #define W1_42_CHAIN 0x99 #define W1_42_CHAIN_OFF 0x3C #define W1_42_CHAIN_OFF_INV 0xC3