From patchwork Wed Aug 2 23:25:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Klinger X-Patchwork-Id: 796942 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xN8SZ4940z9s82 for ; Thu, 3 Aug 2017 09:25:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751897AbdHBXZs (ORCPT ); Wed, 2 Aug 2017 19:25:48 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:59313 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751791AbdHBXZr (ORCPT ); Wed, 2 Aug 2017 19:25:47 -0400 Received: from localhost ([2.174.136.118]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Ll1ub-1d5MDx0IHV-00ajuu; Thu, 03 Aug 2017 01:25:24 +0200 Date: Thu, 3 Aug 2017 01:25:36 +0200 From: Andreas Klinger To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-iio@vger.kernel.org Cc: wsa@the-dreams.de, robh+dt@kernel.org, mark.rutland@arm.com, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] iio: srf08: add support for srf02 in i2c mode Message-ID: <20170802232536.GA15377@arbeit> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:krcbCUpoQ/L49RlBj09FkGH9T7bTXNgebYJ0VBZblNpwQAXBf9M uUQKuzo9YQplQ959BukAEko7pkoRFgK2JNI1HvsRZfbgtd4qT6D32dqnJ79cHqTzOdxRzhU ZtLJSi3GSFluU0hQgDddGt/d99oAGDtHTQ4TYdZPzxl0zMVYzZoGZzWJBK7y5Gk8NL6zaLb NVzQa6fo8Se8aDvf34OSw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ib9wslZPZqM=:WOb/BqPXHCtpHC8N+oTMhA jqa2O2VagOSiDhRbNCCH5Z2nsOFNB4wZsZ280zYI5tlJjLfUq465DiRJWthE0CqP/kFWsJnk0 znAUy5++WuMjUxRw7KK+T/no70AwjZY7x/eawho5xotKluH35Jm3db9mQi31dg+UVawlB7nHR bo1RirQVdpYLaDdCYyicDKvkjxOM1YYGmmqaWref9aAoCxwXY12AOil3bDkqIKou1pEiqZrNI VUSyIVNSg1wkZaohfvkco5INPU7oEwmRNE9YpA07stJrMwb8O8gds/xG5tjC/8CJEj9wuIcn6 sWdQMWJ1lXcWLmcnD49Lh9NB0ZwsjOQNiaka0jovaQJ2Mz8LsoLgwItsTvVJnSycEet5F02Ep 2iHuk/AhgTiC/o+ffdnX377PleXdhrgRe1ClKAKBivDBlpHwZ8cfcUeGj5SNFqcxYbiTq1P/e W02kCPOqZ/tefxfCiz/QD8YZXCSG8TnhIp+TQtqo/6ZXgtYLmroJVXuINrHaFjlaIzDBiwu+e nZwTDvYVSj0mehIXAuA0dcspZaMXANp4JX5zOkZgoBRSZ9dKyVv1AaXJugT2CzdlbufiBG1wn 3LfEkr1n6XCPYJNXzQUouCbKPkxJ96yWmvHnXRHTRRuPj/teZ52m5PIU7TKE+dO0T2P4yfbNU 49c+I59JTqTM3YgpMvijgSvFEo9Wl2bZQY3PJ0oDDFuX7jZ9hJNVJHdaDC4EwxyN3HDmNz9MK Y8bgglHWby8galhaAgyhO/Bq6Ps7TzL+7Uvjaw== Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org srf02 added with support for i2c interface Attributes for setting max range or sensitivity are omitted for the case of srf02 type sensor, because they are not supported by the hardware. Signed-off-by: Andreas Klinger --- drivers/iio/proximity/srf08.c | 56 ++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index a2913a5bf68e..a63c272c3b22 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -1,14 +1,17 @@ /* - * srf08.c - Support for Devantech SRF08 ultrasonic ranger + * srf08.c - Support for Devantech SRF02/SRF08/SRF10 ultrasonic ranger + * with I2C-Interface * - * Copyright (c) 2016 Andreas Klinger + * Copyright (c) 2016, 2017 Andreas Klinger * * This file is subject to the terms and conditions of version 2 of - * the GNU General Public License. See the file COPYING in the main + * the GNU General Public License. See the file COPYING in the main * directory of this archive for more details. * * For details about the device see: * http://www.robot-electronics.co.uk/htm/srf08tech.html + * http://www.robot-electronics.co.uk/htm/srf10tech.htm + * http://www.robot-electronics.co.uk/htm/srf02tech.htm */ #include @@ -38,6 +41,7 @@ #define SRF08_MAX_SENSITIVITY 32 /* number of Gain Register values */ enum srf08_sensor_type { + SRF02, SRF08, SRF10, SRF_MAX_TYPE @@ -61,6 +65,13 @@ struct srf08_data { * is called "Sensitivity" here. */ static const int srf08_sensitivity[SRF_MAX_TYPE][SRF08_MAX_SENSITIVITY] = { + /* SRF02: unused */ + { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 + }, /* SRF08 */ { 94, 97, 100, 103, 107, 110, 114, 118, @@ -78,6 +89,8 @@ static const int srf08_sensitivity[SRF_MAX_TYPE][SRF08_MAX_SENSITIVITY] = { }; static const int srf08_default_sensitivity[SRF_MAX_TYPE] = { + /* SRF02: unused*/ + 0, /* SRF08 */ 1025, /* SRF10 */ @@ -394,7 +407,7 @@ static const struct iio_chan_spec srf08_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(1), }; -static const struct iio_info srf08_info = { +static struct iio_info srf08_info = { .read_raw = srf08_read_raw, .attrs = &srf08_attribute_group, .driver_module = THIS_MODULE, @@ -425,6 +438,11 @@ static int srf08_probe(struct i2c_client *client, indio_dev->name = id->name; indio_dev->dev.parent = &client->dev; indio_dev->modes = INDIO_DIRECT_MODE; + + /* srf02 is not using sensitivity nor max_range */ + if (id->driver_data == SRF02) + srf08_info.attrs = NULL; + indio_dev->info = &srf08_info; indio_dev->channels = srf08_channels; indio_dev->num_channels = ARRAY_SIZE(srf08_channels); @@ -438,24 +456,27 @@ static int srf08_probe(struct i2c_client *client, return ret; } - /* - * set default values of device here - * these register values cannot be read from the hardware - * therefore set driver specific default values - */ - ret = srf08_write_range_mm(data, SRF08_DEFAULT_RANGE); - if (ret < 0) - return ret; + if (id->driver_data != SRF02) { + /* + * set default values of device here + * these register values cannot be read from the hardware + * therefore set driver specific default values + */ + ret = srf08_write_range_mm(data, SRF08_DEFAULT_RANGE); + if (ret < 0) + return ret; - ret = srf08_write_sensitivity(data, - srf08_default_sensitivity[id->driver_data]); - if (ret < 0) - return ret; + ret = srf08_write_sensitivity(data, + srf08_default_sensitivity[id->driver_data]); + if (ret < 0) + return ret; + } return devm_iio_device_register(&client->dev, indio_dev); } static const struct of_device_id of_srf08_match[] = { + { .compatible = "devantech,srf02", (void *)SRF02}, { .compatible = "devantech,srf08", (void *)SRF08}, { .compatible = "devantech,srf10", (void *)SRF10}, {}, @@ -464,6 +485,7 @@ static const struct of_device_id of_srf08_match[] = { MODULE_DEVICE_TABLE(of, of_srf08_match); static const struct i2c_device_id srf08_id[] = { + { "srf02", SRF02 }, { "srf08", SRF08 }, { "srf10", SRF10 }, { } @@ -481,5 +503,5 @@ static struct i2c_driver srf08_driver = { module_i2c_driver(srf08_driver); MODULE_AUTHOR("Andreas Klinger "); -MODULE_DESCRIPTION("Devantech SRF08/SRF10 ultrasonic ranger driver"); +MODULE_DESCRIPTION("Devantech SRF02/SRF08/SRF10 i2c ultrasonic ranger driver"); MODULE_LICENSE("GPL");