From: Marc Titinger <mtitinger@baylibre.com>
To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
mturquette@baylibre.com, bcousson@baylibre.com,
ptitiano@baylibre.com, Marc Titinger <mtitinger@baylibre.com>
Subject: [RFC 2/4] iio: ina2xx: add SAMP_FREQ attribute.
Date: Tue, 10 Nov 2015 17:07:31 +0100 [thread overview]
Message-ID: <1447171653-12756-3-git-send-email-mtitinger@baylibre.com> (raw)
In-Reply-To: <1447171653-12756-1-git-send-email-mtitinger@baylibre.com>
Signed-off-by: Marc Titinger <mtitinger@baylibre.com>
---
drivers/iio/adc/ina2xx-iio.c | 51 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ina2xx-iio.c b/drivers/iio/adc/ina2xx-iio.c
index 257d8d5..92169e1 100644
--- a/drivers/iio/adc/ina2xx-iio.c
+++ b/drivers/iio/adc/ina2xx-iio.c
@@ -42,7 +42,8 @@
/* settings - depend on use case */
#define INA219_CONFIG_DEFAULT 0x399F /* PGA=8 */
#define INA226_CONFIG_DEFAULT 0x4327
-#define INA226_DEFAULT_AVG 4
+#define INA226_DEFAULT_AVG 4
+#define INA226_DEFAULT_FREQ 454
#define INA2XX_RSHUNT_DEFAULT 10000
@@ -51,6 +52,8 @@
#define INA226_READ_AVG(reg) (((reg) & INA226_AVG_RD_MASK) >> 9)
#define INA226_SHIFT_AVG(val) ((val) << 9)
+#define INA226_SFREQ_RD_MASK 0x01f8
+
static struct regmap_config ina2xx_regmap_config = {
.reg_bits = 8,
.val_bits = 16,
@@ -172,6 +175,10 @@ static int ina2xx_read_raw(struct iio_dev *indio_dev,
return ina2xx_get_value(chip, INA2XX_CALIBRATION, regval,
val, val2);
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ *val = chip->freq;
+ return IIO_VAL_INT;
+
default:
return -EINVAL;
}
@@ -216,6 +223,38 @@ static unsigned int ina226_set_average(struct ina2xx_chip_info *chip,
return 0;
}
+/*
+ * Conversion times in uS
+ */
+static const int ina226_conv_time_tab[] = { 140, 204, 332, 588, 1100,
+ 2116, 4156, 8244};
+
+static unsigned int ina226_set_frequency(struct ina2xx_chip_info *chip,
+ unsigned int val,
+ unsigned int *config)
+{
+ int bits;
+
+ if (val > 3550 || val < 50)
+ return -EINVAL;
+
+ /* integration time in uS, for both voltage channels */
+ val = DIV_ROUND_CLOSEST(1000000, 2 * val);
+
+ bits = find_closest(val, ina226_conv_time_tab,
+ ARRAY_SIZE(ina226_conv_time_tab));
+
+ chip->period_us = 2 * ina226_conv_time_tab[bits];
+
+ chip->freq = DIV_ROUND_CLOSEST(1000000, chip->period_us);
+
+ *config &= ~INA226_SFREQ_RD_MASK;
+ *config |= (bits << 3) | (bits << 6);
+
+ return 0;
+}
+
+
static int ina2xx_write_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int val, int val2, long mask)
@@ -238,6 +277,11 @@ static int ina2xx_write_raw(struct iio_dev *indio_dev,
ret = ina226_set_average(chip, val, &tmp);
break;
+ case IIO_CHAN_INFO_SAMP_FREQ:
+
+ ret = ina226_set_frequency(chip, val, &tmp);
+ break;
+
default:
ret = -EINVAL;
}
@@ -257,6 +301,7 @@ _err:
.channel = (_index), \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
.info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_AVERAGE_RAW) | \
+ BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
BIT(IIO_CHAN_INFO_CALIBSCALE), \
.scan_index = (_index), \
.scan_type = { \
@@ -355,8 +400,10 @@ static int ina2xx_probe(struct i2c_client *client,
/* Patch the current config register with default. */
val = chip->config->config_default;
- if (id->driver_data == ina226)
+ if (id->driver_data == ina226) {
ina226_set_average(chip, INA226_DEFAULT_AVG, &val);
+ ina226_set_frequency(chip, INA226_DEFAULT_FREQ, &val);
+ }
ret = ina2xx_init(chip, val);
if (ret < 0) {
--
1.9.1
next prev parent reply other threads:[~2015-11-10 16:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-10 16:07 [RFC 0/4] IIO: add support for INA2xx power monitor Marc Titinger
2015-11-10 16:07 ` [RFC 1/4] iio: ina2xx: add direct IO support for TI INA2xx Power Monitors Marc Titinger
2015-11-11 10:14 ` Daniel Baluta
2015-11-12 9:25 ` Marc Titinger
2015-11-11 12:09 ` Daniel Baluta
2015-11-12 9:38 ` Marc Titinger
2015-11-12 12:57 ` [RFC v2 1/2] " Marc Titinger
2015-11-14 18:59 ` Jonathan Cameron
2015-11-16 9:31 ` Marc Titinger
2015-11-16 17:27 ` Jonathan Cameron
2015-11-12 12:57 ` [RFC v2 2/2] iio: ina2xx: add SOFTWARE buffer mode using an iio kfifo Marc Titinger
2015-11-10 16:07 ` Marc Titinger [this message]
2015-11-11 10:17 ` [RFC 2/4] iio: ina2xx: add SAMP_FREQ attribute Daniel Baluta
2015-11-10 16:07 ` [RFC 3/4] iio: ina2xx: add debugfs reg access Marc Titinger
2015-11-10 16:07 ` [RFC 4/4] iio: ina2xx: add SOFTWARE buffer mode using an iio kfifo Marc Titinger
2015-11-10 18:23 ` Lars-Peter Clausen
2015-11-12 10:18 ` Marc Titinger
2015-11-12 10:20 ` Lars-Peter Clausen
2015-11-14 18:44 ` Jonathan Cameron
2015-11-16 9:37 ` Marc Titinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447171653-12756-3-git-send-email-mtitinger@baylibre.com \
--to=mtitinger@baylibre.com \
--cc=bcousson@baylibre.com \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=pmeerw@pmeerw.net \
--cc=ptitiano@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox