From patchwork Sun Jul 10 06:49:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 9222347 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 13AE760772 for ; Sun, 10 Jul 2016 06:52:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECF6A2521F for ; Sun, 10 Jul 2016 06:52:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E05C725227; Sun, 10 Jul 2016 06:52:25 +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, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 17E7E2521F for ; Sun, 10 Jul 2016 06:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750761AbcGJGwY (ORCPT ); Sun, 10 Jul 2016 02:52:24 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33843 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750727AbcGJGwY (ORCPT ); Sun, 10 Jul 2016 02:52:24 -0400 Received: by mail-pf0-f193.google.com with SMTP id g202so618287pfb.1 for ; Sat, 09 Jul 2016 23:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=l8LJkhM4514Vq/LioORMlQTLnki6hyampCSKP9CD1FM=; b=Kvyl7J2YmJFsZz6RHV5pipjDBWn4kagBhN7H9KKEptaA0CzJDH8Lc6dgIWgsVuYsYM cVbPX5f+kHDQO5OBmeZO1k1/QMo3I9gan5tWlHE2ZLMiKr4Li7+8VE/pslTSOz5DSBWi Qdl67EzLKs5d3AK56l8H9yQeCwXqL68hlGX7lmBdyk7Rx9U02EdtlI4CiGCYbhoGEJt9 qBmEIn3VGW4V+kdQhTvQ1UKjU6RwaO+tVvkruRBd2qmVcAtNML1MsI9KF4zqjJzLXpQr lPx4Otv0NhakSggmgm/CkH8e6zBQ1iSumg46VRsgt/1if6z9jnaz1HMCsc+1TyYhwnPq 94WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=l8LJkhM4514Vq/LioORMlQTLnki6hyampCSKP9CD1FM=; b=BCj+l8j6pmkw2z3RB4T0zWW8Py5G5HJi/DXz9oKjs3vUhRnM0swOl7blei61otwqCY hADHeXoP3X2sZonRIOQwPskJk75W4MQhLdER58bbexOFE6TEydmOdv6SoEqNtwO4KKpy nvwZZRkHxYJvYkFnq9qyEg16GM7pXYTC/ypKvnv12ppr/QaZhmda1aynfIFsPJl1X+4g DBp7Pun5QDKjDwxUj0JkJAeh8k3rx1cdBHMK94YMtJgb/jJKA40DSCI6Tjc3rW2V13lw yqEbNB/jkYIuSFgO3yj5jBhwogDecXrkUbTUaxYGqx4Nlr/EgOpp1u0iww1NYSuzwCrv BIZg== X-Gm-Message-State: ALyK8tKpiV11XJ4xoJul82XsD2oB3/NB2fvouLdr305cupZPLH6A0FAM794q87fR4IIhog== X-Received: by 10.98.84.197 with SMTP id i188mr24137167pfb.43.1468133543249; Sat, 09 Jul 2016 23:52:23 -0700 (PDT) Received: from localhost.localdomain (c-73-25-156-150.hsd1.or.comcast.net. [73.25.156.150]) by smtp.gmail.com with ESMTPSA id p4sm1836132pac.46.2016.07.09.23.52.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 09 Jul 2016 23:52:22 -0700 (PDT) From: Matt Ranostay To: linux-hwmon@vger.kernel.org Cc: Matt Ranostay , Guenter Roeck , David Frey Subject: [PATCH v2] hwmon: sht3x: add humidity heater element control Date: Sat, 9 Jul 2016 23:49:18 -0700 Message-Id: <1468133358-23534-1-git-send-email-mranostay@gmail.com> X-Mailer: git-send-email 2.7.4 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 The enables control of the SHT31 sensors heating element that can turned on to remove excess humidity. Cc: Guenter Roeck Cc: David Frey Signed-off-by: Matt Ranostay --- Changes from v1: * Remove useless mutex_lock on data * Changed documentation to be more Documentation/hwmon/sht3x | 4 ++++ drivers/hwmon/sht3x.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/Documentation/hwmon/sht3x b/Documentation/hwmon/sht3x index f5aa633ed383..b0d88184f48e 100644 --- a/Documentation/hwmon/sht3x +++ b/Documentation/hwmon/sht3x @@ -67,6 +67,10 @@ temp1_alarm: alarm flag is set to 1 if the temperature is outside the configured limits. Alarm only works in periodic measure mode humidity1_alarm: alarm flag is set to 1 if the humidity is outside the configured limits. Alarm only works in periodic measure mode +heater_enable: heater enable, heating element removes excess humidity from + sensor + 0: turned off + 1: turned on update_interval: update interval, 0 for single shot, interval in msec for periodic measurement. If the interval is not supported by the sensor, the next faster interval is chosen diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c index b2c655add70e..e586fe9cb2b9 100644 --- a/drivers/hwmon/sht3x.c +++ b/drivers/hwmon/sht3x.c @@ -44,6 +44,10 @@ static const unsigned char sht3x_cmd_measure_nonblocking_lpm[] = { 0x24, 0x16 }; static const unsigned char sht3x_cmd_measure_periodic_mode[] = { 0xe0, 0x00 }; static const unsigned char sht3x_cmd_break[] = { 0x30, 0x93 }; +/* commands for heater control */ +static const unsigned char sht3x_cmd_heater_on[] = { 0x30, 0x6d }; +static const unsigned char sht3x_cmd_heater_off[] = { 0x30, 0x66 }; + /* other commands */ static const unsigned char sht3x_cmd_read_status_reg[] = { 0xf3, 0x2d }; static const unsigned char sht3x_cmd_clear_status_reg[] = { 0x30, 0x41 }; @@ -507,6 +511,49 @@ static ssize_t humidity1_alarm_show(struct device *dev, return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x08)); } +static ssize_t heater_enable_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + char buffer[SHT3X_WORD_LEN + SHT3X_CRC8_LEN]; + int ret; + + ret = status_register_read(dev, attr, buffer, + SHT3X_WORD_LEN + SHT3X_CRC8_LEN); + if (ret) + return ret; + + return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x20)); +} + +static ssize_t heater_enable_store(struct device *dev, + struct device_attribute *attr, + const char *buf, + size_t count) +{ + struct sht3x_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; + int ret; + bool status; + + ret = kstrtobool(buf, &status); + if (ret) + return ret; + + mutex_lock(&data->i2c_lock); + + if (status) + ret = i2c_master_send(client, (char *) &sht3x_cmd_heater_on, + SHT3X_CMD_LENGTH); + else + ret = i2c_master_send(client, (char *) &sht3x_cmd_heater_off, + SHT3X_CMD_LENGTH); + + mutex_unlock(&data->i2c_lock); + + return ret; +} + static ssize_t update_interval_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -612,6 +659,8 @@ static SENSOR_DEVICE_ATTR(humidity1_min_hyst, S_IRUGO | S_IWUSR, static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, temp1_alarm_show, NULL, 0); static SENSOR_DEVICE_ATTR(humidity1_alarm, S_IRUGO, humidity1_alarm_show, NULL, 0); +static SENSOR_DEVICE_ATTR(heater_enable, S_IRUGO | S_IWUSR, + heater_enable_show, heater_enable_store, 0); static SENSOR_DEVICE_ATTR(update_interval, S_IRUGO | S_IWUSR, update_interval_show, update_interval_store, 0); @@ -628,6 +677,7 @@ static struct attribute *sht3x_attrs[] = { &sensor_dev_attr_humidity1_min_hyst.dev_attr.attr, &sensor_dev_attr_temp1_alarm.dev_attr.attr, &sensor_dev_attr_humidity1_alarm.dev_attr.attr, + &sensor_dev_attr_heater_enable.dev_attr.attr, &sensor_dev_attr_update_interval.dev_attr.attr, NULL };