[PATCH 2/3] stagging:iio:meter: Add ade7854_read_raw function

Rodrigo Siqueira
2018-04-21T11:55:52Z

This patch adds the ade7854_read_raw() function which is responsible for
handling the read operation for registers: AIGAIN, BIGAIN, CIGAIN,
NIGAIN, AVGAIN, BVGAIN, and CVGAIN. For the sake of simplicity, this
patch only adds basic manipulation for current and voltage channels.
Finally, this patch disables the old approach for reading data.

Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
---
drivers/staging/iio/meter/ade7854.c | 41 ++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
index 2fbb2570ba54..242ecde75900 100644
--- a/drivers/staging/iio/meter/ade7854.c
+++ b/drivers/staging/iio/meter/ade7854.c
@@ -229,31 +229,31 @@ static int ade7854_reset(struct device *dev)
}

static IIO_DEV_ATTR_AIGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_AIGAIN);
static IIO_DEV_ATTR_BIGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_BIGAIN);
static IIO_DEV_ATTR_CIGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_CIGAIN);
static IIO_DEV_ATTR_NIGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_NIGAIN);
static IIO_DEV_ATTR_AVGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_AVGAIN);
static IIO_DEV_ATTR_BVGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_BVGAIN);
static IIO_DEV_ATTR_CVGAIN(0644,
- ade7854_read_24bit,
+ NULL,
ade7854_write_24bit,
ADE7854_CVGAIN);
static IIO_DEV_ATTR_APPARENT_POWER_A_GAIN(0644,
@@ -471,6 +471,32 @@ static int ade7854_set_irq(struct device *dev, bool enable)
return st->write_reg(dev, ADE7854_MASK0, irqen, 32);
}

+static int ade7854_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val,
+ int *val2,
+ long mask)
+{
+ struct ade7854_state *st = iio_priv(indio_dev);
+ int ret;
+
+ if (mask != IIO_CHAN_INFO_SCALE)
+ return -EINVAL;
+
+ switch (chan->type) {
+ case IIO_CURRENT:
+ case IIO_VOLTAGE:
+ ret = st->read_reg(&indio_dev->dev, chan->address, val, 24);
+ if (ret < 0)
+ return ret;
+ return IIO_VAL_INT;
+ default:
+ break;
+ }
+
+ return -EINVAL;
+}
+
static int ade7854_initial_setup(struct iio_dev *indio_dev)
{
int ret;
@@ -572,6 +598,7 @@ static const struct attribute_group ade7854_attribute_group = {

static const struct iio_info ade7854_info = {
.attrs = &ade7854_attribute_group,
+ .read_raw = &ade7854_read_raw,
};

int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
--
2.17.0