From patchwork Wed Aug 16 19:34:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Klinger X-Patchwork-Id: 802222 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 3xXfgw3TF0z9t2V for ; Thu, 17 Aug 2017 05:35:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbdHPTeq (ORCPT ); Wed, 16 Aug 2017 15:34:46 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:65338 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752758AbdHPTep (ORCPT ); Wed, 16 Aug 2017 15:34:45 -0400 Received: from localhost ([2.165.245.241]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MJsOK-1dgxca42o0-001BMc; Wed, 16 Aug 2017 21:34:25 +0200 Date: Wed, 16 Aug 2017 21:34:54 +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 v3 5/5] iio: srf08: add support for srf02 in i2c mode Message-ID: <20170816193454.GA24449@arbeit> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:vXJ5XLSggAlAbNMB72fWB7qo/ktCL1LWC1YIMUf/FqbZud8/2aO ulN29z9W5ig71tkh0wLyQo4suXlfAg+DGFL7Ek1S9gX8i0fZ51YpDK/UPUV63rjTHff5OdU mOCz5C0KNNQg1rmDV8j0zbPKKcgfHpt3nQKT5KIcWj6+QFOKDocaAd7+DhPrrwauTkXtsNO E1I60Ei04oFVz5rTvND+Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:c9aCNMbzBbw=:LDhxxQKIqOveh0Z6cmVMS7 B2kXYbGs2OFcZyLkeAX0JCLhXyPz+5IGXz5HVhWQtnS9fXHI8WKi+aRCRQ0ZQN2QwYOiGJ2Wy DN+/t69WqYrLDk2NL1hOD74WvL90qLxg8CkB15sKxbYcfee7ddAsVP7ETd98jZUYbDyqq6oN1 1zeA8cic75Gaowh1foj9WNr9XD5tJgro7NUEl3rsrNCYbdpUtxTjgSTPsTulUyBPreMPbcLaV pJkU547S63dngGjBkmYRN5A7FjEtL3Jm4hPDrbNs1SDaa+Asb6hPIo1Eq0bOJT3ai47WzEgV7 QySdn2u+ijDEsHQ1toFDL2Q+Jai9awHH5ecWC0mBLyveo8Cu6Hsyuf8+zll03EhjQtE4fq+hw fyEu9l5rP0J/X9pnGnglftSzHbcMHyJ+GSVtw5Lq0nqaxeyoZGKI4obZZpl85eiaeQ9o5fazJ eLZ8v/zTDA7PEZeYhX/CIemFDL5sbCHDrupXeSJqMXXtb93oQLtexoJTnu5SODkxCAz0mAR9Q t0+6LageJEg7it7Lyoy1JRDzsd7Y6LGXs23g6ATImUS/XFlq1RYfRgnBUG8g1PFW3WxyG9hlM 0EicJJT5VjOtuVCLHELWI+rH1n2tqMAjuX3EAS9nBiEFuU57jQxS7ElrIuJJvupZiwCEWsdym hYpSN420/Z7u+stpREG//hwRvc5Fg3VXVqcsZcaNiaL2HkO/x+6Q1SNQ3UBCKw5I3r+fVDLQc P9Ebh2J9dNdjQKBMyibgS2+gcC8KPRoE3wdTBg== 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/Kconfig | 8 ++--- drivers/iio/proximity/srf08.c | 81 +++++++++++++++++++++++++++++++++---------- 2 files changed, 67 insertions(+), 22 deletions(-) diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig index df33ccc0d035..ae070950f920 100644 --- a/drivers/iio/proximity/Kconfig +++ b/drivers/iio/proximity/Kconfig @@ -57,12 +57,12 @@ config SX9500 module will be called sx9500. config SRF08 - tristate "Devantech SRF08/SRF10 ultrasonic ranger sensor" + tristate "Devantech SRF02/SRF08/SRF10 ultrasonic ranger sensor" depends on I2C help - Say Y here to build a driver for Devantech SRF08/SRF10 ultrasonic - ranger sensor. This driver can be used to measure the distance - of objects. + Say Y here to build a driver for Devantech SRF02/SRF08/SRF10 + ultrasonic 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 srf08. diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index 1f9b03944da4..9380d545aab1 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -1,17 +1,18 @@ /* * srf08.c - Support for Devantech SRFxx ultrasonic ranger * with i2c interface - * actually supported are srf08, srf10 + * actually supported are srf02, srf08, srf10 * - * 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 @@ -36,9 +37,8 @@ #define SRF08_CMD_RANGING_CM 0x51 /* Ranging Mode - Result in cm */ -#define SRF08_DEFAULT_RANGE 6020 /* default value of Range in mm */ - enum srf08_sensor_type { + SRF02, SRF08, SRF10, SRF_MAX_TYPE @@ -48,6 +48,9 @@ struct srf08_chip_info { const int *sensitivity_avail; int num_sensitivity_avail; int sensitivity_default; + + /* default value of Range in mm */ + int range_default; }; struct srf08_data { @@ -83,6 +86,14 @@ struct srf08_data { * But with ADC's this term is already used differently and that's why it * is called "Sensitivity" here. */ +static const struct srf08_chip_info srf02_chip_info = { + .sensitivity_avail = NULL, + .num_sensitivity_avail = 0, + .sensitivity_default = 0, + + .range_default = 0, +}; + static const int srf08_sensitivity_avail[] = { 94, 97, 100, 103, 107, 110, 114, 118, 123, 128, 133, 139, 145, 152, 159, 168, @@ -94,6 +105,8 @@ static const struct srf08_chip_info srf08_chip_info = { .sensitivity_avail = srf08_sensitivity_avail, .num_sensitivity_avail = ARRAY_SIZE(srf08_sensitivity_avail), .sensitivity_default = 1025, + + .range_default = 6020, }; static const int srf10_sensitivity_avail[] = { @@ -106,6 +119,8 @@ static const struct srf08_chip_info srf10_chip_info = { .sensitivity_avail = srf10_sensitivity_avail, .num_sensitivity_avail = ARRAY_SIZE(srf10_sensitivity_avail), .sensitivity_default = 700, + + .range_default = 6020, }; static int srf08_read_ranging(struct srf08_data *data) @@ -424,6 +439,15 @@ static const struct iio_info srf08_info = { .driver_module = THIS_MODULE, }; +/* + * srf02 don't have an adjustable range or sensitivity, + * so we don't need attributes at all + */ +static const struct iio_info srf02_info = { + .read_raw = srf08_read_raw, + .driver_module = THIS_MODULE, +}; + static int srf08_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -447,11 +471,17 @@ static int srf08_probe(struct i2c_client *client, data->sensor_type = (enum srf08_sensor_type)id->driver_data; switch (data->sensor_type) { + case SRF02: + data->chip_info = &srf02_chip_info; + indio_dev->info = &srf02_info; + break; case SRF08: data->chip_info = &srf08_chip_info; + indio_dev->info = &srf08_info; break; case SRF10: data->chip_info = &srf10_chip_info; + indio_dev->info = &srf08_info; break; default: return -EINVAL; @@ -460,7 +490,6 @@ 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; - indio_dev->info = &srf08_info; indio_dev->channels = srf08_channels; indio_dev->num_channels = ARRAY_SIZE(srf08_channels); @@ -473,24 +502,39 @@ 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 (data->chip_info->range_default) { + /* + * set default range of device in mm here + * these register values cannot be read from the hardware + * therefore set driver specific default values + * + * srf02 don't have a default value so it'll be omitted + */ + ret = srf08_write_range_mm(data, + data->chip_info->range_default); + if (ret < 0) + return ret; + } - ret = srf08_write_sensitivity(data, + if (data->chip_info->sensitivity_default) { + /* + * set default sensitivity of device here + * these register values cannot be read from the hardware + * therefore set driver specific default values + * + * srf02 don't have a default value so it'll be omitted + */ + ret = srf08_write_sensitivity(data, data->chip_info->sensitivity_default); - if (ret < 0) - return ret; + 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}, {}, @@ -499,6 +543,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 }, { } @@ -516,5 +561,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");