From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D6EAC432C0 for ; Tue, 3 Dec 2019 11:07:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E431206EC for ; Tue, 3 Dec 2019 11:07:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=trafsysas.onmicrosoft.com header.i=@trafsysas.onmicrosoft.com header.b="P7kWmhFB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725838AbfLCLHa (ORCPT ); Tue, 3 Dec 2019 06:07:30 -0500 Received: from mail-eopbgr50106.outbound.protection.outlook.com ([40.107.5.106]:25646 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725829AbfLCLHa (ORCPT ); Tue, 3 Dec 2019 06:07:30 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UH8Vzvc5JSaGzAXnuWHxPMVQOK0xHR1/nJY6U/KKw4coazN/Yy7gk90Zs1iVclb3OT55lwnSSKp+jxKC/wyFhum3cyK+nWevM7Zu17C5FC9vy83csXP6thh30OU4qqs3qAlS9F0bNzahjaGE1/Noh5Q7aLxQkvE+CdKCLX8SRlHhJcK+FE99TYQK3lw525dRgsomNKpZ7A1JN77pYIc5aHHowS5ZVkhDdBtER+uJVylZjJZa+j4BJMQHnaA9K5ptXZzNIxchcGnTmfH9VzyaSQ511EbK0DM+sBoIgN11fkriRrGUwPsLMcfkR0Jf3way29ZGBYtf+bs3rJMT5eLarg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5Myjr64gotiuOllz3XdRpKqDfcLsDEj36Q4/NZdx9gE=; b=RWElmJbrvEmv22ztkN5iJwcrBFbWHtAs9PAoyP8k4qlz0V5CAoMeIOmxg7XgFV7U1QOoFC8DRYnhUwW0qR/GtfYBAHdaSNleQrMPARwssUgSeLdKaekMFS6mRuriaRYOPOkK0pnvLGiOmpl7hXWPngVY8aul+EpP63GyqFBDsic19fr66E8Ck94lQkjByPhYRJ8CuLK93zoUJbvySBiC7GG3ndkwrjIuaJPobtf+nanKIaoR1HwMYDzqvvlSqNN+oGEvdtXGKcQ45cecUPepoKOIvLSma39X4aZtgt7yuNhiadOtZHyEtvMJqQA4+2ClWJNVa366dH6npDRHcvyIcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=norphonic.com; dmarc=pass action=none header.from=norphonic.com; dkim=pass header.d=norphonic.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trafsysas.onmicrosoft.com; s=selector2-trafsysas-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5Myjr64gotiuOllz3XdRpKqDfcLsDEj36Q4/NZdx9gE=; b=P7kWmhFBZsJtz8DfbnYr+299BuaoNybaPg5um8BrB4eXRul9GD9YUf3zQaChHNPjSnOjCcsP5efFMOkr6fHu3lJyRsLGDT68RGvJZsywyRPclj4TK7S0A5wKhPq1FEYp+B8EEYKhwGSX+a+hvEfmKyvJaP7MaXOQo+EXXM9a4/g= Received: from VI1PR06MB5790.eurprd06.prod.outlook.com (20.177.202.94) by VI1PR06MB5934.eurprd06.prod.outlook.com (20.178.120.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.22; Tue, 3 Dec 2019 11:07:19 +0000 Received: from VI1PR06MB5790.eurprd06.prod.outlook.com ([fe80::a56e:b59e:d95f:c568]) by VI1PR06MB5790.eurprd06.prod.outlook.com ([fe80::a56e:b59e:d95f:c568%4]) with mapi id 15.20.2495.014; Tue, 3 Dec 2019 11:07:19 +0000 From: Eugene Zalkonnikov To: Jonathan Cameron , Eugene Zalkonnikov CC: Hartmut Knaack , Lars-Peter Clausen , "development@norphonic.com" , "linux-iio@vger.kernel.org" Subject: Re: [PATCH v2 1/2] Driver for TI HDC20x0 humidity and temperature sensors Thread-Topic: [PATCH v2 1/2] Driver for TI HDC20x0 humidity and temperature sensors Thread-Index: AQHVqbMiF7qR+SRdokmvz+tzmAQIm6eoMHaAgAAPyAA= Date: Tue, 3 Dec 2019 11:07:19 +0000 Message-ID: <469A12E5-6D24-402C-B8E4-1D1B9D709DF6@norphonic.com> References: <1FA22019-2D01-45B2-9C6B-0F6720F1B4A2@norphonic.com> <20191201123606.1db0d5b1@archlinux> <221cc09d-340c-b5b5-7af6-0608588598a1@norphonic.com> In-Reply-To: <221cc09d-340c-b5b5-7af6-0608588598a1@norphonic.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=ez@norphonic.com; x-originating-ip: [2a02:2121:34a:d3d5:9d77:75bf:7c62:d45c] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f3a36df6-8e03-4818-681b-08d777e0f6fc x-ms-traffictypediagnostic: VI1PR06MB5934: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-forefront-prvs: 02408926C4 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39830400003)(376002)(346002)(136003)(366004)(189003)(199004)(25786009)(6306002)(14444005)(8936002)(6116002)(8676002)(7736002)(81156014)(81166006)(256004)(86362001)(33656002)(508600001)(966005)(66946007)(66476007)(66556008)(64756008)(99286004)(66446008)(91956017)(76116006)(6246003)(71200400001)(71190400001)(4326008)(316002)(229853002)(2906002)(305945005)(110136005)(54906003)(6512007)(46003)(14454004)(36756003)(186003)(6506007)(11346002)(102836004)(2616005)(446003)(5660300002)(6486002)(76176011)(6436002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR06MB5934;H:VI1PR06MB5790.eurprd06.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: norphonic.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2D6We9yHu3Xu6guXB+198r6V0b0j1XhjF9WKMKzC3wLCHMXqC9Dq+SoeG6IWECvMhckU1WE/f0VjM9uhxxizaSxK6Ecj6cDWiR21RpiBaPTOLsuYkmkOWvipqf+2Khnb1da6rQnqv3axTbn1dq3myhRBUL04N/K0OBoGQllZ1IO3bF/BDyqyeNUh5LLcIx+WF06LoaAxOzzSXX1QgsiX7gfX6AnpPBGOHMkZFRt50GGBBvaNKIOnsln91wFDEEm/lpyxy/ETer7xG9f/uGIFqX2uGMZ6p1Gw836fMIpvXC4zwRMxcYcg2oGda6TMHnfMx77RRHPj2wteYBjVFd5/94LhMP8skm79v03kAcQEOl7AdRvnlp5oHlUn8sSBTroJWQNmOSwW766tD0MXN29yTlMz5iNTlbUw78bM2aq8bb/0pOyySzKDTPE6fuf3/m6hazsDjkDnMzqUN25SWOPj4cTWCeyjSRrnGSQGj5SrhEY= Content-Type: text/plain; charset="us-ascii" Content-ID: <96721A969FD9264BABA25C3E0B08AA02@eurprd06.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: norphonic.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3a36df6-8e03-4818-681b-08d777e0f6fc X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2019 11:07:19.4901 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: cbf3f496-45ad-415e-97cb-4e62d6cd974f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: qaz7dcSATbjGdL3pmQMVCWm/PRe2TttzbWxeZUpNPF91DEgWli36MM3RFlEKGWgO/OJjVGJa/+VpUXcIkUwmdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB5934 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org With above mentioned changes, Signed-off-by: Eugene Zaikonnikov diff -uprN -X linux-5.3.8/Documentation/dontdiff linux-5.3.8/drivers/iio/hu= midity/hdc2010.c linux-5.3.8_hdc2010/drivers/iio/humidity/hdc2010.c --- linux-5.3.8/drivers/iio/humidity/hdc2010.c 1970-01-01 01:00:00.00000000= 0 +0100 +++ linux-5.3.8_hdc2010/drivers/iio/humidity/hdc2010.c 2019-12-03 11:59:37.= 443667099 +0100 @@ -0,0 +1,348 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * hdc2010.c - Support for the TI HDC2010 and HDC2080 + * temperature + relative humidity sensors + * + * Copyright (C) 2019 Norphonic AS + * Author: Eugene Zaikonnikov + * + * Datasheets: + * http://www.ti.com/product/HDC2010/datasheet + * http://www.ti.com/product/HDC2080/datasheet + */ + +#include +#include +#include + +#include +#include + +#define HDC2010_REG_TEMP_LOW 0x00 +#define HDC2010_REG_TEMP_HIGH 0x01 +#define HDC2010_REG_HUMIDITY_LOW 0x02 +#define HDC2010_REG_HUMIDITY_HIGH 0x03 +#define HDC2010_REG_INTERRUPT_DRDY 0x04 +#define HDC2010_REG_TEMP_MAX 0x05 +#define HDC2010_REG_HUMIDITY_MAX 0x06 +#define HDC2010_REG_INTERRUPT_EN 0x07 +#define HDC2010_REG_TEMP_OFFSET_ADJ 0x08 +#define HDC2010_REG_HUMIDITY_OFFSET_ADJ 0x09 +#define HDC2010_REG_TEMP_THR_L 0x0a +#define HDC2010_REG_TEMP_THR_H 0x0b +#define HDC2010_REG_RH_THR_L 0x0c +#define HDC2010_REG_RH_THR_H 0x0d +#define HDC2010_REG_RESET_DRDY_INT_CONF 0x0e +#define HDC2010_REG_MEASUREMENT_CONF 0x0f + +#define HDC2010_MEAS_CONF GENMASK(2, 1) +#define HDC2010_MEAS_TRIG BIT(0) +#define HDC2010_HEATER_EN BIT(3) +#define HDC2010_AMM GENMASK(6, 4) + +struct hdc2010_data { + struct i2c_client *client; + struct mutex lock; + u8 measurement_config; + u8 interrupt_config; + u8 drdy_config; +}; + +enum hdc2010_addr_groups { + HDC2010_GROUP_TEMP =3D 0, + HDC2010_GROUP_HUMIDITY +}; + +struct hdc2010_reg_record { + unsigned long primary; + unsigned long peak; +}; + +static const struct hdc2010_reg_record hdc2010_reg_translation[] =3D { + [HDC2010_GROUP_TEMP] =3D { + .primary =3D HDC2010_REG_TEMP_LOW, + .peak =3D HDC2010_REG_TEMP_MAX, + }, + [HDC2010_GROUP_HUMIDITY] =3D { + .primary =3D HDC2010_REG_HUMIDITY_LOW, + .peak =3D HDC2010_REG_HUMIDITY_MAX, + }, +}; + +static IIO_CONST_ATTR(out_current_heater_raw_available, + "0 1"); + +static struct attribute *hdc2010_attributes[] =3D { + &iio_const_attr_out_current_heater_raw_available.dev_attr.attr, + NULL +}; + +static const struct attribute_group hdc2010_attribute_group =3D { + .attrs =3D hdc2010_attributes, +}; + +static const struct iio_chan_spec hdc2010_channels[] =3D { + { + .type =3D IIO_TEMP, + .address =3D HDC2010_GROUP_TEMP, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_PEAK) | + BIT(IIO_CHAN_INFO_OFFSET) | + BIT(IIO_CHAN_INFO_SCALE), + }, + { + .type =3D IIO_HUMIDITYRELATIVE, + .address =3D HDC2010_GROUP_HUMIDITY, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_PEAK) | + BIT(IIO_CHAN_INFO_SCALE), + }, + { + .type =3D IIO_CURRENT, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), + .extend_name =3D "heater", + .output =3D 1, + }, + IIO_CHAN_SOFT_TIMESTAMP(2), +}; + +static int hdc2010_update_drdy_config(struct hdc2010_data *data, + char mask, char val) +{ + char tmp =3D (~mask & data->drdy_config) | val; + int ret; + + ret =3D i2c_smbus_write_byte_data(data->client, + HDC2010_REG_RESET_DRDY_INT_CONF, tmp); + if (!ret) + data->drdy_config =3D tmp; + + return ret; +} + +static int hdc2010_get_measurement_word(struct hdc2010_data *data, + struct iio_chan_spec const *chan) +{ + struct i2c_client *client =3D data->client; + s32 ret; + + ret =3D i2c_smbus_read_word_data(data->client, + hdc2010_reg_translation[chan->address].primary); + + if (ret < 0) { + dev_err(&client->dev, "Could not read sensor data\n"); + } + + return ret; +} + +static int hdc2010_get_measurement_byte(struct hdc2010_data *data, + struct iio_chan_spec const *chan) +{ + struct i2c_client *client =3D data->client; + s32 ret; + + ret =3D i2c_smbus_read_byte_data(data->client, + hdc2010_reg_translation[chan->address].peak); + + if (ret < 0) { + dev_err(&client->dev, "Could not read sensor data\n"); + } + + return ret; +} + +static int hdc2010_get_heater_status(struct hdc2010_data *data) +{ + return !!(data->drdy_config & HDC2010_HEATER_EN); +} + +static int hdc2010_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, int *val, + int *val2, long mask) +{ + struct hdc2010_data *data =3D iio_priv(indio_dev); + + switch (mask) { + case IIO_CHAN_INFO_ENABLE: { + int ret; + + mutex_lock(&data->lock); + if (chan->type =3D=3D IIO_CURRENT) { + *val =3D hdc2010_get_heater_status(data); + ret =3D IIO_VAL_INT; + } else + ret =3D -EINVAL; + mutex_unlock(&data->lock); + return ret; + } + case IIO_CHAN_INFO_RAW: { + int ret; + + mutex_lock(&data->lock); + if (chan->type =3D=3D IIO_CURRENT) { + *val =3D hdc2010_get_heater_status(data); + ret =3D IIO_VAL_INT; + } else { + ret =3D iio_device_claim_direct_mode(indio_dev); + if (ret) { + mutex_unlock(&data->lock); + return ret; + } + ret =3D hdc2010_get_measurement_word(data, chan); + iio_device_release_direct_mode(indio_dev); + if (ret >=3D 0) { + *val =3D ret; + ret =3D IIO_VAL_INT; + } else + ret =3D -EINVAL; + } + mutex_unlock(&data->lock); + return ret; + } + case IIO_CHAN_INFO_PEAK: { + int ret; + + mutex_lock(&data->lock); + ret =3D iio_device_claim_direct_mode(indio_dev); + if (ret) { + mutex_unlock(&data->lock); + return ret; + } + ret =3D hdc2010_get_measurement_byte(data, chan); + iio_device_release_direct_mode(indio_dev); + if (ret >=3D 0) { + /* Scaling up the value so we can use same offset as RAW */ + *val =3D ret * 256; + ret =3D IIO_VAL_INT; + } else + ret =3D -EINVAL; + mutex_unlock(&data->lock); + return ret; + } + case IIO_CHAN_INFO_SCALE: + *val2 =3D 65536; + if (chan->type =3D=3D IIO_TEMP) + *val =3D 165000; + else + *val =3D 100000; + return IIO_VAL_FRACTIONAL; + case IIO_CHAN_INFO_OFFSET: + *val =3D -15887; + *val2 =3D 515151; + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } +} + +static int hdc2010_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct hdc2010_data *data =3D iio_priv(indio_dev); + int new, ret =3D -EINVAL; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + if (chan->type !=3D IIO_CURRENT || val2 !=3D 0) + return -EINVAL; + + if (val =3D=3D 1) + new =3D HDC2010_HEATER_EN; + else if (!val) + new =3D 0; + else + return -EINVAL; + + mutex_lock(&data->lock); + ret =3D hdc2010_update_drdy_config(data, HDC2010_HEATER_EN, new); + mutex_unlock(&data->lock); + return ret; + default: + return -EINVAL; + } +} + +static const struct iio_info hdc2010_info =3D { + .read_raw =3D hdc2010_read_raw, + .write_raw =3D hdc2010_write_raw, + .attrs =3D &hdc2010_attribute_group, +}; + +static int hdc2010_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct iio_dev *indio_dev; + struct hdc2010_data *data; + u8 tmp; + int ret; + + if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA | + I2C_FUNC_SMBUS_BYTE | I2C_FUNC_I2C)) + return -EOPNOTSUPP; + + indio_dev =3D devm_iio_device_alloc(&client->dev, sizeof(*data)); + if (!indio_dev) + return -ENOMEM; + + data =3D iio_priv(indio_dev); + i2c_set_clientdata(client, indio_dev); + data->client =3D client; + mutex_init(&data->lock); + + indio_dev->dev.parent =3D &client->dev; + indio_dev->name =3D dev_name(&client->dev); + indio_dev->modes =3D INDIO_DIRECT_MODE; + indio_dev->info =3D &hdc2010_info; + + indio_dev->channels =3D hdc2010_channels; + indio_dev->num_channels =3D ARRAY_SIZE(hdc2010_channels); + + /* Enable Automatic Measurement Mode at 5Hz */ + hdc2010_update_drdy_config(data, HDC2010_AMM, HDC2010_AMM); + + /* + * We enable both temp and humidity measurement. + * However the measurement won't start even in AMM until triggered. + */ + tmp =3D (u8)(~HDC2010_MEAS_CONF | + HDC2010_MEAS_TRIG & data->measurement_config) + | HDC2010_MEAS_TRIG; + + ret =3D i2c_smbus_write_byte_data(data->client, + HDC2010_REG_MEASUREMENT_CONF, tmp); + if (ret) + return ret; + data->measurement_config =3D tmp; + + return devm_iio_device_register(&client->dev, indio_dev); +} + +static const struct i2c_device_id hdc2010_id[] =3D { + { "hdc2010", 0 }, + { "hdc2080", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, hdc2010_id); + +static const struct of_device_id hdc2010_dt_ids[] =3D { + { .compatible =3D "ti,hdc2010" }, + { .compatible =3D "ti,hdc2080" }, + { } +}; +MODULE_DEVICE_TABLE(of, hdc2010_dt_ids); + +static struct i2c_driver hdc2010_driver =3D { + .driver =3D { + .name =3D "hdc2010", + .of_match_table =3D of_match_ptr(hdc2010_dt_ids), + }, + .probe =3D hdc2010_probe, + .id_table =3D hdc2010_id, +}; +module_i2c_driver(hdc2010_driver); + +MODULE_AUTHOR("Eugene Zaikonnikov "); +MODULE_DESCRIPTION("TI HDC2010 humidity and temperature sensor driver"); +MODULE_LICENSE("GPL"); diff -uprN -X linux-5.3.8/Documentation/dontdiff linux-5.3.8/drivers/iio/hu= midity/Kconfig linux-5.3.8_hdc2010/drivers/iio/humidity/Kconfig --- linux-5.3.8/drivers/iio/humidity/Kconfig 2019-10-29 09:22:48.000000000 = +0100 +++ linux-5.3.8_hdc2010/drivers/iio/humidity/Kconfig 2019-11-28 14:31:27.79= 4242693 +0100 @@ -38,6 +38,16 @@ config HDC100X To compile this driver as a module, choose M here: the module will be called hdc100x. =20 +config HDC2010 + tristate "TI HDC2010 relative humidity and temperature sensor" + depends on I2C + help + Say yes here to build support for the Texas Instruments + HDC2010 and HDC2080 relative humidity and temperature sensors. + + To compile this driver as a module, choose M here: the module + will be called hdc2010. + config HID_SENSOR_HUMIDITY tristate "HID Environmental humidity sensor" depends on HID_SENSOR_HUB diff -uprN -X linux-5.3.8/Documentation/dontdiff linux-5.3.8/drivers/iio/hu= midity/Makefile linux-5.3.8_hdc2010/drivers/iio/humidity/Makefile --- linux-5.3.8/drivers/iio/humidity/Makefile 2019-10-29 09:22:48.000000000= +0100 +++ linux-5.3.8_hdc2010/drivers/iio/humidity/Makefile 2019-11-28 14:30:40.6= 09892061 +0100 @@ -6,6 +6,7 @@ obj-$(CONFIG_AM2315) +=3D am2315.o obj-$(CONFIG_DHT11) +=3D dht11.o obj-$(CONFIG_HDC100X) +=3D hdc100x.o +obj-$(CONFIG_HDC2010) +=3D hdc2010.o obj-$(CONFIG_HID_SENSOR_HUMIDITY) +=3D hid-sensor-humidity.o =20 hts221-y :=3D hts221_core.o \