From patchwork Tue May 14 22:58:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 10944047 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 091B0912 for ; Tue, 14 May 2019 22:58:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E80D3288BA for ; Tue, 14 May 2019 22:58:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5A7428978; Tue, 14 May 2019 22:58:58 +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 976DC288BA for ; Tue, 14 May 2019 22:58:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726619AbfENW6v (ORCPT ); Tue, 14 May 2019 18:58:51 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:46951 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726211AbfENW6v (ORCPT ); Tue, 14 May 2019 18:58:51 -0400 Received: by mail-lj1-f194.google.com with SMTP id h21so708985ljk.13; Tue, 14 May 2019 15:58:49 -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 :mime-version:content-transfer-encoding; bh=gZVMN8/nkNZPwJ4nxT+MnKGLnGrLHF7tYGoJosAOMHw=; b=CDg8FU8tSs7liAGNjY6AcOUg2Ieq8Kj9BJ2LAzmGNTQrqWGNyh2nr7O+ilg/cdEWem osZpCzFp7lasLWrJi/b1G/5BBh3CLSygk9krVjIprTQN4maU/ofklEyzk7qYqOZICi6y /QJuRedqh06thayCmz4zJJ5NkBDiK5qZ3DUBaKWz1FNlJAhM24QUB+EuDwONf3PkC9T2 WTDDtXVkKTWmmCjjpydYjzGAf2qw6MUvxD74mO63x9IGCQ9rTEEW3LQE6bqAaL7i/Wbk ex7PDuhSV/Du64Hwm4Z+TLW5lJT75+M+YgeiRfeJkWynzUi/KNQv9spPq0ygQWabxtJ7 5wYg== 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:mime-version:content-transfer-encoding; bh=gZVMN8/nkNZPwJ4nxT+MnKGLnGrLHF7tYGoJosAOMHw=; b=a7b8MAPJZW7RU/VgRv2O4+O//jlfBkQo9kgJ60zf4TBviB09eW+9WlnXQCJ2Cyk7IZ 0Q7+OzahbniTHuESzae4wlrXR7QcFNx818aXuFXr4OP3++ksmEmy9BJSgUY09MfUVohB xtZvdVEoIUAq6bsUlqOK3aWs6Y3m8pU7WtB7OZ3xN3gzpXhyMKUgB+PJnWD/D4OyZK7H /wQIqTnhOSzR+vc/hHNPUAlmTcAu8auv/FCxJ0pwFz448+AbPczfBJVDdNpFrfpIbKGq 2vuWYkTgnX92HiXgaYN+1pTwEBsN2aL7ahSR0Sg8+wHmA0gW9/ogZ+YQcz7upQvNRe5J UNSg== X-Gm-Message-State: APjAAAU57hIFjgkxZKjaQ0lykPUMEfOaUI0YfGnZzoR3QCmTJblPaKW/ V19InNUAx2wEf6kjNKlHoNQ= X-Google-Smtp-Source: APXvYqz3b4MiI9zchwlY0YLD6sT9SNCXSHIAqdHM63D4PMcKRMl9350I9mKTUO5C8FEnwjR6ZF933Q== X-Received: by 2002:a2e:9786:: with SMTP id y6mr18362706lji.185.1557874728428; Tue, 14 May 2019 15:58:48 -0700 (PDT) Received: from localhost.localdomain ([5.164.217.122]) by smtp.gmail.com with ESMTPSA id n26sm30342lfi.90.2019.05.14.15.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 15:58:47 -0700 (PDT) From: Serge Semin To: Jean Delvare , Guenter Roeck , Serge Semin Cc: Serge Semin , linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org Subject: [PATCH 2/2] hwmon: Add ads1000/ads1100 voltage ADCs driver Date: Wed, 15 May 2019 01:58:09 +0300 Message-Id: <20190514225810.12591-3-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190514225810.12591-1-fancer.lancer@gmail.com> References: <20190514225810.12591-1-fancer.lancer@gmail.com> MIME-Version: 1.0 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 These are simple Texas Instruments ADC working over i2c-interface with just one differential input and with configurable 12-16 bits resolution. Sample rate is fixed to 128 for ads1000 and can vary from 8 to 128 for ads1100. Vdd value reference value must be supplied so to properly translate the sampled code to the real voltage. All of these configs are implemented in the device drivers for hwmon subsystem. The next dts properties should be specified to comply the device platform setup: - vdd-supply - voltage regulator connected to the Vdd pin of the device - ti,gain - programmable gain amplifier - ti,datarate - converter data rate - ti,voltage-divider - possible resistors-base external divider See bindings documentation file for details. Even though these devices seem more like ads1015 series, they in fact pretty much different. First of all ads1000/ads1100 got less capabilities: just one port, no configurations of digital comparator, no input multi-channel multiplexer, smaller PGA and data-rate ranges. In addition they haven't got internal voltage reference, but instead are created to use Vdd pin voltage. Finally the output code value is provided in different format. As a result it was much easier for development and for future support to create a separate driver. Signed-off-by: Serge Semin --- MAINTAINERS | 8 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/ads1000.c | 320 ++++++++++++++++++++++++++ include/linux/platform_data/ads1000.h | 20 ++ 5 files changed, 359 insertions(+) create mode 100644 drivers/hwmon/ads1000.c create mode 100644 include/linux/platform_data/ads1000.h diff --git a/MAINTAINERS b/MAINTAINERS index ce573aaa04df..5c3a8107ef1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -517,6 +517,14 @@ W: http://ez.analog.com/community/linux-device-drivers S: Supported F: drivers/video/backlight/adp8860_bl.c +ADS1000 HARDWARE MONITOR DRIVER +M: Serge Semin +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/ads1000.rst +F: drivers/hwmon/ads1000.c +F: include/linux/platform_data/ads1000.h + ADS1015 HARDWARE MONITOR DRIVER M: Dirk Eibach L: linux-hwmon@vger.kernel.org diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 1915a18b537b..a1220cc48f2f 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1569,6 +1569,16 @@ config SENSORS_ADC128D818 This driver can also be built as a module. If so, the module will be called adc128d818. +config SENSORS_ADS1000 + tristate "Texas Instruments ADS1000" + depends on I2C + help + If you say yes here you get support for Texas Instruments + ADS1000/ADS1100 12-16-bit single channel ADC device. + + This driver can also be built as a module. If so, the module + will be called ads1000. + config SENSORS_ADS1015 tristate "Texas Instruments ADS1015" depends on I2C diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 8db472ea04f0..2cd82f6c651e 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o obj-$(CONFIG_SENSORS_ADM1029) += adm1029.o obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o +obj-$(CONFIG_SENSORS_ADS1000) += ads1000.o obj-$(CONFIG_SENSORS_ADS1015) += ads1015.o obj-$(CONFIG_SENSORS_ADS7828) += ads7828.o obj-$(CONFIG_SENSORS_ADS7871) += ads7871.o diff --git a/drivers/hwmon/ads1000.c b/drivers/hwmon/ads1000.c new file mode 100644 index 000000000000..a88b738f56bd --- /dev/null +++ b/drivers/hwmon/ads1000.c @@ -0,0 +1,320 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Driver for ADS1000/ADS1100 12-16-bit ADC + * + * Copyright (C) 2019 T-platforms JSC (fancer.lancer@gmail.com) + * + * Based on the ads1015 driver by Dirk Eibach. + * + * Datasheet available at: http://focus.ti.com/lit/ds/symlink/ads1000.pdf + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Data rates scale table */ +static const unsigned int scale_table[4] = { + 2048, 8192, 16384, 32768 +}; + +/* Minimal data rates in samples per second */ +static const unsigned int data_rate_table[4] = { + 100, 25, 12, 5 +}; + +#define ADS1000_DEFAULT_PGA 0 +#define ADS1000_DEFAULT_DATA_RATE 0 +#define ADS1000_DEFAULT_R1_DIVIDER 0 +#define ADS1000_DEFAULT_R2_DIVIDER 0 + +enum ads1000_chips { + ads1000, + ads1100, +}; + +struct ads1000 { + struct device *hwmon_dev; + struct mutex update_lock; + struct i2c_client *client; + struct ads1000_platform_data data; + enum ads1000_chips id; +}; + +static inline int ads1000_enable_vdd(struct ads1000 *priv) +{ + return regulator_enable(priv->data.vdd); +} + +static inline int ads1000_get_vdd(struct ads1000 *priv) +{ + return regulator_get_voltage(priv->data.vdd); +} + +static int ads1000_read_adc(struct ads1000 *priv) +{ + struct i2c_client *client = priv->client; + unsigned int delay_ms; + u8 data[3] = {0}; + int res; + + mutex_lock(&priv->update_lock); + + delay_ms = DIV_ROUND_UP(1000, data_rate_table[priv->data.data_rate]); + + /* setup and start single conversion */ + data[2] |= (1 << 7) | (1 << 4); + data[2] |= priv->data.pga; + data[2] |= priv->data.data_rate << 2; + + res = i2c_master_send(client, &data[2], 1); + if (res < 0) + goto err_unlock; + + /* wait until conversion finished */ + msleep(delay_ms); + res = i2c_master_recv(client, data, 3); + if (res < 0) + goto err_unlock; + + if (data[2] & (1 << 7)) { + res = -EIO; + goto err_unlock; + } + + res = ((u16)data[0] << 8) | data[1]; + +err_unlock: + mutex_unlock(&priv->update_lock); + + return res; +} + +static int ads1000_reg_to_mv(struct ads1000 *priv, s16 reg) +{ + unsigned int *divider = priv->data.divider; + int voltage = ads1000_get_vdd(priv); + int gain = 1 << priv->data.pga; + int c = 0; + + voltage = reg*DIV_ROUND_CLOSEST(voltage, 1000); + gain = gain*scale_table[priv->data.data_rate]; + voltage = DIV_ROUND_CLOSEST(voltage, gain); + + if (divider[0] && divider[1]) { + c = divider[0]*voltage; + c = DIV_ROUND_CLOSEST(c, (int)divider[1]); + } + + return voltage + c; +} + +static ssize_t show_in(struct device *dev, struct device_attribute *da, + char *buf) +{ + struct ads1000 *priv = dev_get_drvdata(dev); + int res; + + res = ads1000_read_adc(priv); + if (res < 0) + return res; + + return sprintf(buf, "%d\n", ads1000_reg_to_mv(priv, res)); +} + +static SENSOR_DEVICE_ATTR(in0_input, 0444, show_in, NULL, 0); + +static struct attribute *ads1000_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + NULL +}; +ATTRIBUTE_GROUPS(ads1000); + +static struct ads1000 *ads1000_create_priv(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct ads1000 *priv; + + priv = devm_kzalloc(&client->dev, sizeof(struct ads1000), + GFP_KERNEL); + if (!priv) + return ERR_PTR(-ENOMEM); + + if (client->dev.of_node) + priv->id = (enum ads1000_chips) + of_device_get_match_data(&client->dev); + else + priv->id = id->driver_data; + + i2c_set_clientdata(client, priv); + priv->client = client; + mutex_init(&priv->update_lock); + + return priv; +} + +#ifdef CONFIG_OF +static int ads1000_get_config_of(struct ads1000 *priv) +{ + struct i2c_client *client = priv->client; + struct device_node *node = client->dev.of_node; + u32 divider[2]; + u32 val; + + if (!node) + return -EINVAL; + + if (!of_property_read_u32(node, "ti,gain", &val)) + priv->data.pga = val; + + if (!of_property_read_u32(node, "ti,datarate", &val)) + priv->data.data_rate = val; + + if (!of_property_read_u32_array(node, "ti,voltage-divider", + divider, 2)) { + priv->data.divider[0] = divider[0]; + priv->data.divider[1] = divider[1]; + } + + priv->data.vdd = devm_regulator_get(&client->dev, "vdd"); + if (IS_ERR(priv->data.vdd)) + return PTR_ERR(priv->data.vdd); + + return 0; +} +#endif + +static int ads1000_get_config(struct ads1000 *priv) +{ + struct i2c_client *client = priv->client; + struct ads1000_platform_data *pdata = dev_get_platdata(&client->dev); + + priv->data.pga = ADS1000_DEFAULT_PGA; + priv->data.data_rate = ADS1000_DEFAULT_DATA_RATE; + priv->data.divider[0] = ADS1000_DEFAULT_R1_DIVIDER; + priv->data.divider[1] = ADS1000_DEFAULT_R2_DIVIDER; + + /* prefer platform data */ + if (pdata) { + memcpy(&priv->data, pdata, sizeof(priv->data)); + } else { +#ifdef CONFIG_OF + int ret; + + ret = ads1000_get_config_of(priv); + if (ret) + return ret; +#endif + } + + if (!priv->data.vdd) { + dev_err(&client->dev, "No VDD regulator\n"); + return -EINVAL; + } + + if (priv->data.pga > 4) { + dev_err(&client->dev, "Invalid gain, using default\n"); + priv->data.pga = ADS1000_DEFAULT_PGA; + } + + if (priv->data.data_rate > 4) { + dev_err(&client->dev, "Invalid datarate, using default\n"); + priv->data.data_rate = ADS1000_DEFAULT_DATA_RATE; + } + + if (priv->id == ads1000 && priv->data.data_rate != 0) { + dev_warn(&client->dev, "ADC data rate can be 128SPS only\n"); + priv->data.data_rate = 0; + } + + return 0; +} + +static int ads1000_set_config(struct ads1000 *priv) +{ + u8 data = 0; + int ret; + + /* disable continuous conversion */ + data |= (1 << 4); + data |= priv->data.pga; + data |= priv->data.data_rate << 2; + + ret = i2c_master_send(priv->client, &data, 1); + + return ret < 0 ? ret : 0; +} + +static int ads1000_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct ads1000 *priv; + int ret; + + priv = ads1000_create_priv(client, id); + if (IS_ERR(priv)) + return PTR_ERR(priv); + + ret = ads1000_get_config(priv); + if (ret) + return ret; + + ret = ads1000_enable_vdd(priv); + if (ret) + return ret; + + ret = ads1000_set_config(priv); + if (ret) + return ret; + + priv->hwmon_dev = devm_hwmon_device_register_with_groups(&client->dev, + client->name, priv, ads1000_groups); + if (IS_ERR(priv->hwmon_dev)) + return PTR_ERR(priv->hwmon_dev); + + return 0; +} + +static const struct i2c_device_id ads1000_id[] = { + { "ads1000", ads1000}, + { "ads1100", ads1100}, + { } +}; +MODULE_DEVICE_TABLE(i2c, ads1000_id); + +static const struct of_device_id ads1000_of_match[] = { + { + .compatible = "ti,ads1000", + .data = (void *)ads1000 + }, + { + .compatible = "ti,ads1100", + .data = (void *)ads1100 + }, + { }, +}; +MODULE_DEVICE_TABLE(of, ads1000_of_match); + +static struct i2c_driver ads1000_driver = { + .driver = { + .name = "ads1000", + .of_match_table = of_match_ptr(ads1000_of_match), + }, + .probe = ads1000_probe, + .id_table = ads1000_id, +}; +module_i2c_driver(ads1000_driver); + +MODULE_AUTHOR("Serge Semin "); +MODULE_DESCRIPTION("ADS1000 driver"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/platform_data/ads1000.h b/include/linux/platform_data/ads1000.h new file mode 100644 index 000000000000..979670483537 --- /dev/null +++ b/include/linux/platform_data/ads1000.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Platform Data for ADS1000/ADS1100 12-16-bit ADC + * + * Copyright (C) 2019 T-platforms JSC (fancer.lancer@gmail.com) + */ + +#ifndef LINUX_ADS1000_H +#define LINUX_ADS1000_H + +#include + +struct ads1000_platform_data { + unsigned int pga; + unsigned int data_rate; + struct regulator *vdd; + unsigned int divider[2]; +}; + +#endif /* LINUX_ADS1000_H */