From patchwork Tue Sep 18 08:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Qiang X-Patchwork-Id: 10603847 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 8C1AE112B for ; Tue, 18 Sep 2018 08:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 793212A318 for ; Tue, 18 Sep 2018 08:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CF142A664; Tue, 18 Sep 2018 08:24:31 +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 304432A318 for ; Tue, 18 Sep 2018 08:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728859AbeIRN4A (ORCPT ); Tue, 18 Sep 2018 09:56:00 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:33046 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727813AbeIRN4A (ORCPT ); Tue, 18 Sep 2018 09:56:00 -0400 Received: by mail-pg1-f196.google.com with SMTP id s7-v6so667527pgc.0; Tue, 18 Sep 2018 01:24:28 -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=bUtEbji0Uuj7+vEnuB/oL2nJ0RKtNGGqxXa4wJgcLuY=; b=DqE/OGPME5swSbHr9ifo1E3kxLjsEtQvrFUCGXxIxs2oB0hy9/zkVyKDrUBydn/EiG zwnWc81QFN+U9pya7r8o3RDT8ucuIO8gliB6MyUOUsr6Ty3mKkhPkdDaO9ZkS6K43l42 B37T/WjidmIO+LwPzrAWymvbGRiqsPfE0inDGUsnV+qTodI3XMbP5Z48+7DSon8VXqvV DDnPp05vcaoXPTncG+LDF4uqjeSRDlzBCSK/jMe3bBJKVifjwloHa8E2GCtgjeZY4eml kyzlcH2xex8C/KtZBZkxA4NVahWhamoLy0v0v4wZDzmBc9IuP13o/Iz1AXRriPkc2cmx zdQQ== 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=bUtEbji0Uuj7+vEnuB/oL2nJ0RKtNGGqxXa4wJgcLuY=; b=c/jIvFbM8tbsIznjhrdQDewKfNaaVDRygboecNWOwUQcd+BOKGMmFYR8Qq2jW3arRh /rF4wCJZEPqgiuSAGLbaKY/1FRLfxPoqRyiKWdK7FMPU+yHG+ccC+rbIprUBU6Hos+uL 32ffyn/bIcZCBZdOBYEyKbt6+hTu9KxDWGYnQufTpvPZfjbcTPo7VM8dQ4YlxOoA4Kh3 qQ64U87DLiQ7jaApqQBejik4tr9VYYTfWtA7uEHEu2+1OZXZZ24FGcMcucBhTkbe8d0g xEQ63bvouflsT0eS0Zolc7u+jt/4s/IyFauVtIRQ7r+9Zwki9OyvEXL8W1B9N6qxBG09 4FQA== X-Gm-Message-State: APzg51C58liD2EjP75F78JLh0744zvT6EDkt2/jfUvDiwruZh/iXydYY mLOcDPx6tH1UDENPqhWCzDg= X-Google-Smtp-Source: ANB0VdZy8kBXGud8hAwfHlc9TOAyOHcdypiB2X32wKbNCIJePyVsVpaXBNvSvb9hDf3HIUwJLCidcA== X-Received: by 2002:a63:c046:: with SMTP id z6-v6mr26862626pgi.114.1537259068025; Tue, 18 Sep 2018 01:24:28 -0700 (PDT) Received: from localhost (104.176.229.35.bc.googleusercontent.com. [35.229.176.104]) by smtp.gmail.com with ESMTPSA id s75-v6sm25916058pfd.108.2018.09.18.01.24.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Sep 2018 01:24:27 -0700 (PDT) From: Song Qiang To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org, mark.rutland@arm.com, andriy.shevchenko@linux.intel.com, matt.ranostay@konsulko.com, tglx@linutronix.de, ak@it-klinger.de Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Song Qiang Subject: [PATCH v6 1/2] iio: proximity: Add driver support for ST's VL53L0X ToF ranging sensor. Date: Tue, 18 Sep 2018 16:24:21 +0800 Message-Id: <20180918082422.13050-1-songqiang1304521@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver was originally written by ST in 2016 as a misc input device driver, and hasn't been maintained for a long time. I grabbed some code from it's API and reformed it into an iio proximity device driver. This version of driver uses i2c bus to talk to the sensor and polling for measuring completes, so no irq line is needed. It can be tested with reading from /sys/bus/iio/devices/iio:deviceX/in_distance_input Signed-off-by: Song Qiang --- Changes in v6: - Remove '.' in mail address. Google doesn't care, these two email address is the same when I log in. - Clean register table. - Put some seperated statements into one line. - Change channel type to *_PROCESSED. - Remove some unneccessary dev_err. - changes iio device name to vl53l0x. Changes in v5: - Correct some spell problems. - Change tries-- to --tries to fix the count error. - Add MODULE_DEVICE_TABLE(). - Add some comments. Changes in v4: - Add datasheet link, default i2c address and TODO list. - Make capitalization of defines consistent. - Replace i2c_transfer() with i2c_smbus_read_i2c_block_data(). - Remove IIO_CHAN_SOFT_TIMESTAMP() since no buffer/trigger support. - Add information to MAINTAINERS. Changes in v3: - Recover ST's copyright. - Clean up indio_dev member in vl53l0x_data struct since it's useless now. - Replace __le16_to_cpu() with le16_to_cpu(). - Remove the iio_device_{claim|release}_direct_mode() since it's only needed when we use buffered mode. - Clean up some coding style problems. Changes in v2: - Clean up the register table. - Sort header files declarations. - Replace some bit definations with GENMASK() and BIT(). - Clean up some code and comments that's useless for now. - Change the order of some the definations of some variables to reversed xmas tree order. - Using do...while() rather while and check. - Replace pr_err() with dev_err(). - Remove device id declaration since we recommend to use DT. - Remove .owner = THIS_MODULE. - Replace probe() with probe_new() hook. - Remove IIO_BUFFER and IIO_TRIGGERED_BUFFER dependences. - Change the driver module name to vl53l0x-i2c. - Align all the parameters if they are in the same function with open parentheses. - Replace iio_device_register() with devm_iio_device_register for better resource management. - Remove the vl53l0x_remove() since it's not needed. - Remove dev_set_drvdata() since it's already setted above. .../bindings/iio/proximity/vl53l0x.txt | 12 ++ MAINTAINERS | 7 + drivers/iio/proximity/Kconfig | 11 ++ drivers/iio/proximity/Makefile | 2 + drivers/iio/proximity/vl53l0x-i2c.c | 157 ++++++++++++++++++ 5 files changed, 189 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt create mode 100644 drivers/iio/proximity/vl53l0x-i2c.c diff --git a/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt b/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt new file mode 100644 index 000000000000..ab9a9539fec4 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt @@ -0,0 +1,12 @@ +ST VL53L0X ToF ranging sensor + +Required properties: + - compatible: must be "st,vl53l0x-i2c" + - reg: i2c address where to find the device + +Example: + +vl53l0x@29 { + compatible = "st,vl53l0x-i2c"; + reg = <0x29>; +}; diff --git a/MAINTAINERS b/MAINTAINERS index 967ce8cdd1cc..349e2bc97cec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13510,6 +13510,13 @@ L: linux-i2c@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-stm32* +ST VL53L0X ToF RANGER(I2C) IIO DRIVER +M: Song Qiang +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/proximity/vl53l0x-i2c.c +F: Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt + STABLE BRANCH M: Greg Kroah-Hartman L: stable@vger.kernel.org diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig index f726f9427602..5f421cbd37f3 100644 --- a/drivers/iio/proximity/Kconfig +++ b/drivers/iio/proximity/Kconfig @@ -79,4 +79,15 @@ config SRF08 To compile this driver as a module, choose M here: the module will be called srf08. +config VL53L0X_I2C + tristate "STMicroelectronics VL53L0X ToF ranger sensor (I2C)" + depends on I2C + help + Say Y here to build a driver for STMicroelectronics VL53L0X + ToF ranger sensors with i2c interface. + This driver can be used to measure the distance of objects. + + To compile this driver as a module, choose M here: the + module will be called vl53l0x-i2c. + endmenu diff --git a/drivers/iio/proximity/Makefile b/drivers/iio/proximity/Makefile index 4f4ed45e87ef..dedfb5bf3475 100644 --- a/drivers/iio/proximity/Makefile +++ b/drivers/iio/proximity/Makefile @@ -10,3 +10,5 @@ obj-$(CONFIG_RFD77402) += rfd77402.o obj-$(CONFIG_SRF04) += srf04.o obj-$(CONFIG_SRF08) += srf08.o obj-$(CONFIG_SX9500) += sx9500.o +obj-$(CONFIG_VL53L0X_I2C) += vl53l0x-i2c.o + diff --git a/drivers/iio/proximity/vl53l0x-i2c.c b/drivers/iio/proximity/vl53l0x-i2c.c new file mode 100644 index 000000000000..1aad45df8d95 --- /dev/null +++ b/drivers/iio/proximity/vl53l0x-i2c.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Support for ST VL53L0X FlightSense ToF Ranging Sensor on a i2c bus. + * + * Copyright (C) 2016 STMicroelectronics Imaging Division. + * Copyright (C) 2018 Song Qiang + * + * Datasheet available at + * + * + * Default 7-bit i2c slave address 0x29. + * + * TODO: FIFO buffer, continuous mode, interrupts, range selection, + * sensor ID check. + */ + +#include +#include +#include + +#include + +#define VL_REG_SYSRANGE_START 0x00 + +#define VL_REG_SYSRANGE_MODE_MASK GENMASK(3, 0) +#define VL_REG_SYSRANGE_MODE_SINGLESHOT 0x00 +#define VL_REG_SYSRANGE_MODE_START_STOP BIT(0) +#define VL_REG_SYSRANGE_MODE_BACKTOBACK BIT(1) +#define VL_REG_SYSRANGE_MODE_TIMED BIT(2) +#define VL_REG_SYSRANGE_MODE_HISTOGRAM BIT(3) + +#define VL_REG_RESULT_INT_STATUS 0x13 +#define VL_REG_RESULT_RANGE_STATUS 0x14 +#define VL_REG_RESULT_RANGE_STATUS_COMPLETE BIT(0) + +struct vl53l0x_data { + struct i2c_client *client; +}; + +static int vl53l0x_read_proximity(struct vl53l0x_data *data, + const struct iio_chan_spec *chan, + int *val) +{ + struct i2c_client *client = data->client; + u16 tries = 20; + u8 buffer[12]; + int ret; + + ret = i2c_smbus_write_byte_data(client, VL_REG_SYSRANGE_START, 1); + if (ret < 0) + return ret; + + do { + ret = i2c_smbus_read_byte_data(client, + VL_REG_RESULT_RANGE_STATUS); + if (ret < 0) + return ret; + + if (ret & VL_REG_RESULT_RANGE_STATUS_COMPLETE) + break; + + usleep_range(1000, 5000); + } while (--tries); + if (!tries) + return -ETIMEDOUT; + + ret = i2c_smbus_read_i2c_block_data(client, VL_REG_RESULT_RANGE_STATUS, + 12, buffer); + if (ret < 0) + return ret; + else if (ret != 12) + return -EREMOTEIO; + + /* Values should be between 30~1200 in millimeters. */ + *val = le16_to_cpu((buffer[10] << 8) + buffer[11]); + + return 0; +} + +static const struct iio_chan_spec vl53l0x_channels[] = { + { + .type = IIO_DISTANCE, + .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), + }, +}; + +static int vl53l0x_read_raw(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + int *val, int *val2, long mask) +{ + struct vl53l0x_data *data = iio_priv(indio_dev); + int ret; + + if (chan->type != IIO_DISTANCE) + return -EINVAL; + + switch (mask) { + case IIO_CHAN_INFO_PROCESSED: + ret = vl53l0x_read_proximity(data, chan, val); + if (ret < 0) + return ret; + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static const struct iio_info vl53l0x_info = { + .read_raw = vl53l0x_read_raw, +}; + +static int vl53l0x_probe(struct i2c_client *client) +{ + struct vl53l0x_data *data; + struct iio_dev *indio_dev; + + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); + if (!indio_dev) + return -ENOMEM; + + data = iio_priv(indio_dev); + data->client = client; + i2c_set_clientdata(client, indio_dev); + + if (!i2c_check_functionality(client->adapter, + I2C_FUNC_SMBUS_READ_I2C_BLOCK | I2C_FUNC_SMBUS_BYTE_DATA)) + return -EOPNOTSUPP; + + indio_dev->dev.parent = &client->dev; + indio_dev->name = "vl53l0x"; + indio_dev->info = &vl53l0x_info; + indio_dev->channels = vl53l0x_channels; + indio_dev->num_channels = ARRAY_SIZE(vl53l0x_channels); + indio_dev->modes = INDIO_DIRECT_MODE; + + return devm_iio_device_register(&client->dev, indio_dev); +} + +static const struct of_device_id st_vl53l0x_dt_match[] = { + { .compatible = "st,vl53l0x-i2c", }, + { } +}; +MODULE_DEVICE_TABLE(of, st_vl53l0x_dt_match); + +static struct i2c_driver vl53l0x_driver = { + .driver = { + .name = "vl53l0x-i2c", + .of_match_table = st_vl53l0x_dt_match, + }, + .probe_new = vl53l0x_probe, +}; +module_i2c_driver(vl53l0x_driver); + +MODULE_AUTHOR("Song Qiang "); +MODULE_DESCRIPTION("ST vl53l0x ToF ranging sensor driver"); +MODULE_LICENSE("GPL v2"); From patchwork Tue Sep 18 08:24:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Qiang X-Patchwork-Id: 10603849 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 824265A4 for ; Tue, 18 Sep 2018 08:24:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 710F92A318 for ; Tue, 18 Sep 2018 08:24:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 627F52A65E; Tue, 18 Sep 2018 08:24:38 +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 C22D52A318 for ; Tue, 18 Sep 2018 08:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729332AbeIRN4I (ORCPT ); Tue, 18 Sep 2018 09:56:08 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34088 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727813AbeIRN4H (ORCPT ); Tue, 18 Sep 2018 09:56:07 -0400 Received: by mail-pg1-f196.google.com with SMTP id d19-v6so665727pgv.1; Tue, 18 Sep 2018 01:24:36 -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:in-reply-to:references; bh=rJuzf5H04oeGWLXt7aCRE+Y943qmSO/k3ZAGrEXxWpQ=; b=JoFEV1KJNyErQQLGCyQQABOtgMQOl3JJ7zW0gomooH6JY8IQytttQKHGeIYmaRG6WW ltCL3Xga5hf4H/e6O0cXajHWQlJ+mIUdL2fSmydGcOn9k2JGA2z/qeCH4NIKr4peoIQJ yyNIKjmwOVDeAXLpCBXw2VP1Ok1tm1jaO1LxeYHwRjLwq+qudxQrbJsr5wB7F8WKWoYw MOLRdExnnfex5JTfaZ889OTL3OYeJesqy5LQXduByxaJ7CaYLHXcSG5bQ+Jxq/PAFA70 1JVugF4Vj71edT/JGFujW4FFTZ93ZzvPrrw1RvlewgCnbDGMHqaO89EZIvb6puS1dSSy Sjgw== 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=rJuzf5H04oeGWLXt7aCRE+Y943qmSO/k3ZAGrEXxWpQ=; b=oI9VvuKlH7dTS5f7bnmessHcVxt9YhswhcUWNZWg7bDCbGPk2Q8fzd8sSASCkxxahe bHlWd6/OEfgR5x1jrTLWTqs8DSXvgYlIY2Zr8VqOjcT7SZPi+sTXaqrEJAKPV74CPyCx R/iGRckSEczjNlGpFblmuy8W41TD9TbQRbyJt3wPb8/VCtoR3k5JnKecgQkKQFnixgEE qJNZJCXYijjDQXDvQCt8XykwPyD6C5aUA/0a4pBBkO4A7ddx9JF+WpmjGGKS3KvQ0/kJ lXljkPqBC3SQqAAq30+/tL+8TOcqOoJ7eVFknYZ2JUqAk1UzjrNsZIHiWZvxjyGWFMyY oA4g== X-Gm-Message-State: APzg51DROrEqiiil4QGcjVcmxcuDPFl/1RQ2SxMEXcBnjhlguXgmUzWM ojMM6wXfov0G/zkUnYeianw= X-Google-Smtp-Source: ANB0VdawgYQA0JKT7ygVGNVcH0ME6oQ8O3HVHa0/h6jBJttPo/rX+ZQdrHJclxXPciyFZyu/+CB0gg== X-Received: by 2002:a62:3306:: with SMTP id z6-v6mr29499600pfz.85.1537259075803; Tue, 18 Sep 2018 01:24:35 -0700 (PDT) Received: from localhost (104.176.229.35.bc.googleusercontent.com. [35.229.176.104]) by smtp.gmail.com with ESMTPSA id p19-v6sm33896921pgh.60.2018.09.18.01.24.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Sep 2018 01:24:35 -0700 (PDT) From: Song Qiang To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org, mark.rutland@arm.com, andriy.shevchenko@linux.intel.com, matt.ranostay@konsulko.com, tglx@linutronix.de, ak@it-klinger.de Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Song Qiang Subject: [PATCH v6 2/2] iio: proximity: vl53l0x: add interrupt support Date: Tue, 18 Sep 2018 16:24:22 +0800 Message-Id: <20180918082422.13050-2-songqiang1304521@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180918082422.13050-1-songqiang1304521@gmail.com> References: <20180918082422.13050-1-songqiang1304521@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The first version of this driver issues a measuring request and polling for a status register in the device for measuring completes. vl53l0x support configuring GPIO1 on it to generate interrupt to indicate that new measurement is ready. This patch adds support for using this mechanisim to reduce cpu cost. Signed-off-by: Song Qiang --- .../bindings/iio/proximity/vl53l0x.txt | 14 +- drivers/iio/proximity/vl53l0x-i2c.c | 135 +++++++++++++++--- 2 files changed, 129 insertions(+), 20 deletions(-) diff --git a/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt b/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt index ab9a9539fec4..40290f8dd70f 100644 --- a/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt +++ b/Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt @@ -4,9 +4,21 @@ Required properties: - compatible: must be "st,vl53l0x-i2c" - reg: i2c address where to find the device +Optional properties: + - interrupts : Interrupt line receiving GPIO1's measuring complete + output, supports IRQ_TYPE_EDGE_FALLING only. + + Refer to interrupt-controller/interrupts.txt for generic + interrupt client node bindings. + Example: vl53l0x@29 { + pinctrl-names = "default"; + pinctrl-0 = <&vl53l0x_pins>; + compatible = "st,vl53l0x-i2c"; reg = <0x29>; -}; + interrupt-parent = <&gpio3>; + interrupts = <17 IRQ_TYPE_EDGE_FALLING>; +} diff --git a/drivers/iio/proximity/vl53l0x-i2c.c b/drivers/iio/proximity/vl53l0x-i2c.c index 1aad45df8d95..a5cff11f41de 100644 --- a/drivers/iio/proximity/vl53l0x-i2c.c +++ b/drivers/iio/proximity/vl53l0x-i2c.c @@ -10,18 +10,21 @@ * * Default 7-bit i2c slave address 0x29. * - * TODO: FIFO buffer, continuous mode, interrupts, range selection, - * sensor ID check. + * TODO: FIFO buffer, continuous mode, range selection. */ #include #include #include +#include #include +#include + #define VL_REG_SYSRANGE_START 0x00 +/* Mode configuration registers. */ #define VL_REG_SYSRANGE_MODE_MASK GENMASK(3, 0) #define VL_REG_SYSRANGE_MODE_SINGLESHOT 0x00 #define VL_REG_SYSRANGE_MODE_START_STOP BIT(0) @@ -29,14 +32,61 @@ #define VL_REG_SYSRANGE_MODE_TIMED BIT(2) #define VL_REG_SYSRANGE_MODE_HISTOGRAM BIT(3) +/* Result registers. */ #define VL_REG_RESULT_INT_STATUS 0x13 #define VL_REG_RESULT_RANGE_STATUS 0x14 #define VL_REG_RESULT_RANGE_STATUS_COMPLETE BIT(0) +/* GPIO function configuration registers. */ +#define VL_REG_GPIO_HV_MUX_ACTIVE_GIGH 0x84 +#define VL_REG_SYS_INT_CFG_GPIO 0x0A +#define VL_GPIOFUNC_NEW_MEASURE_RDY BIT(2) + +/* Interrupt configuration registers. */ +#define VL_REG_SYS_INT_CLEAR 0x0B +#define VL_REG_RESULT_INT_STATUS 0x13 +#define VL_INT_POLARITY_LOW 0x00 +#define VL_INT_POLARITY_HIGH BIT(0) + +/* Should be 0xEE if connection is fine. */ +#define VL_REG_MODEL_ID 0xC0 + struct vl53l0x_data { struct i2c_client *client; + struct completion measuring_done; + bool use_interrupt; }; +static int vl53l0x_clear_interrupt(struct vl53l0x_data *data) +{ + int ret; + u8 cnt = 0; + + do { + /* bit 0 for measuring interrupt, bit 1 for error interrupt. */ + i2c_smbus_write_byte_data(data->client, + VL_REG_SYS_INT_CLEAR, 1); + i2c_smbus_write_byte_data(data->client, + VL_REG_SYS_INT_CLEAR, 0); + ret = i2c_smbus_read_byte_data(data->client, + VL_REG_RESULT_INT_STATUS); + cnt++; + } while ((ret & 0x07) && (cnt < 3)); + if (cnt > 2) + return -ETIMEDOUT; + else + return 0; +} + +static irqreturn_t vl53l0x_irq_handler(int irq, void *d) +{ + struct vl53l0x_data *data = d; + + complete(&data->measuring_done); + + return IRQ_HANDLED; +} + static int vl53l0x_read_proximity(struct vl53l0x_data *data, const struct iio_chan_spec *chan, int *val) @@ -46,23 +96,31 @@ static int vl53l0x_read_proximity(struct vl53l0x_data *data, u8 buffer[12]; int ret; - ret = i2c_smbus_write_byte_data(client, VL_REG_SYSRANGE_START, 1); - if (ret < 0) - return ret; - - do { - ret = i2c_smbus_read_byte_data(client, - VL_REG_RESULT_RANGE_STATUS); - if (ret < 0) - return ret; - - if (ret & VL_REG_RESULT_RANGE_STATUS_COMPLETE) - break; - - usleep_range(1000, 5000); - } while (--tries); - if (!tries) - return -ETIMEDOUT; + if (data->use_interrupt) + reinit_completion(&data->measuring_done); + + i2c_smbus_write_byte_data(client, VL_REG_SYSRANGE_START, 1); + + /* In usual case the longest valid conversion time is less than 70ms. */ + if (data->use_interrupt) { + ret = wait_for_completion_timeout(&data->measuring_done, + msecs_to_jiffies(100)); + if (!ret) + return -ETIMEDOUT; + vl53l0x_clear_interrupt(data); + } else { + do { + ret = i2c_smbus_read_byte_data(client, + VL_REG_RESULT_RANGE_STATUS); + + if (ret & VL_REG_RESULT_RANGE_STATUS_COMPLETE) + break; + + usleep_range(1000, 5000); + } while (--tries); + if (!tries) + return -ETIMEDOUT; + } ret = i2c_smbus_read_i2c_block_data(client, VL_REG_RESULT_RANGE_STATUS, 12, buffer); @@ -110,10 +168,21 @@ static const struct iio_info vl53l0x_info = { .read_raw = vl53l0x_read_raw, }; +/* Congigure the GPIO1 pin to generate interrupt for measurement ready, + * default polarity is level low. + */ +static int vl53l0x_config_irq(struct vl53l0x_data *data) +{ + i2c_smbus_write_byte_data(data->client, VL_REG_SYS_INT_CFG_GPIO, + VL_GPIOFUNC_NEW_MEASURE_RDY); + return vl53l0x_clear_interrupt(data); +} + static int vl53l0x_probe(struct i2c_client *client) { struct vl53l0x_data *data; struct iio_dev *indio_dev; + int ret; indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); if (!indio_dev) @@ -134,6 +203,34 @@ static int vl53l0x_probe(struct i2c_client *client) indio_dev->num_channels = ARRAY_SIZE(vl53l0x_channels); indio_dev->modes = INDIO_DIRECT_MODE; + if (!client->irq) + data->use_interrupt = false; + else { + data->use_interrupt = true; + ret = devm_request_irq(&client->dev, + client->irq, + vl53l0x_irq_handler, + IRQF_TRIGGER_FALLING, + indio_dev->name, + data); + if (ret < 0) { + dev_err(&client->dev, + "request irq line failed."); + return -EINVAL; + } + vl53l0x_config_irq(data); + init_completion(&data->measuring_done); + } + + /* After checking this, assuming write and read byte operations should + * never fails. + */ + ret = i2c_smbus_read_byte_data(client, VL_REG_MODEL_ID); + if (ret != 0xEE) { + dev_err(&client->dev, "device not found. "); + return -EREMOTEIO; + } + return devm_iio_device_register(&client->dev, indio_dev); }