Skip to content

Commit

Permalink
staging:iio:meter:ade7758: Use iio channel spec and miscellaneous oth…
Browse files Browse the repository at this point in the history 
…er changes.

Use iio channel spec for the ring buffer channels.
Add/update file comment/license headers.
Use available_scan_masks to prevent that multiple channels are enabled.
Remove wavefrom type attributes. (no handled directly by the scan_elements)
Use SPI_MODE_1.
Move ade7758_initial_setup() before ade7758_probe_trigger() to ensure the
ADE7758 interrupt is disabled when the host interrupt get's enabled.
Add spi_device_id.
Update ring buffer setup.

Some backporting needed to ensure driver builds all the way through core
changes.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed May 19, 2011
1 parent 9308bc9 commit 8a27a02
Show file tree
Hide file tree
Showing 3 changed files with 258 additions and 212 deletions.
66 changes: 45 additions & 21 deletions drivers/staging/iio/meter/ade7758.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
* ADE7758 Poly Phase Multifunction Energy Metering IC driver
*
* Copyright 2010-2011 Analog Devices Inc.
*
* Licensed under the GPL-2.
*/

#ifndef _ADE7758_H
#define _ADE7758_H

Expand Down Expand Up @@ -83,12 +91,23 @@
#define ADE7758_MAX_RX 4
#define ADE7758_STARTUP_DELAY 1

#define ADE7758_SPI_SLOW (u32)(300 * 1000)
#define ADE7758_SPI_BURST (u32)(1000 * 1000)
#define ADE7758_SPI_FAST (u32)(2000 * 1000)
#define AD7758_NUM_WAVSEL 5
#define AD7758_NUM_PHSEL 3
#define AD7758_NUM_WAVESRC (AD7758_NUM_WAVSEL * AD7758_NUM_PHSEL)

#define AD7758_PHASE_A 0
#define AD7758_PHASE_B 1
#define AD7758_PHASE_C 2
#define AD7758_CURRENT 0
#define AD7758_VOLTAGE 1
#define AD7758_ACT_PWR 2
#define AD7758_REACT_PWR 3
#define AD7758_APP_PWR 4
#define AD7758_WT(p, w) (((w) << 2) | (p))

#define DRIVER_NAME "ade7758"


/**
* struct ade7758_state - device instance specific data
* @us: actual spi_device
Expand All @@ -99,22 +118,29 @@
* @buf_lock: mutex to protect tx and rx
**/
struct ade7758_state {
struct spi_device *us;
struct iio_dev *indio_dev;
struct iio_trigger *trig;
u8 *tx;
u8 *rx;
struct mutex buf_lock;
struct spi_device *us;
struct iio_dev *indio_dev;
struct iio_trigger *trig;
u8 *tx;
u8 *rx;
struct mutex buf_lock;
u32 available_scan_masks[AD7758_NUM_WAVESRC];
struct iio_chan_spec *ade7758_ring_channels;
struct spi_transfer ring_xfer[4];
struct spi_message ring_msg;
/*
* DMA (thus cache coherency maintenance) requires the
* transfer buffers to live in their own cache lines.
*/
unsigned char rx_buf[8] ____cacheline_aligned;
unsigned char tx_buf[8];

};
#ifdef CONFIG_IIO_RING_BUFFER
/* At the moment triggers are only used for ring buffer
* filling. This may change!
*/

enum ade7758_scan {
ADE7758_SCAN_WFORM,
};

void ade7758_remove_trigger(struct iio_dev *indio_dev);
int ade7758_probe_trigger(struct iio_dev *indio_dev);

Expand All @@ -129,6 +155,12 @@ void ade7758_unconfigure_ring(struct iio_dev *indio_dev);
int ade7758_initialize_ring(struct iio_ring_buffer *ring);
void ade7758_uninitialize_ring(struct iio_ring_buffer *ring);
int ade7758_set_irq(struct device *dev, bool enable);

int ade7758_spi_write_reg_8(struct device *dev,
u8 reg_address, u8 val);
int ade7758_spi_read_reg_8(struct device *dev,
u8 reg_address, u8 *val);

#else /* CONFIG_IIO_RING_BUFFER */

static inline void ade7758_remove_trigger(struct iio_dev *indio_dev)
Expand All @@ -139,14 +171,6 @@ static inline int ade7758_probe_trigger(struct iio_dev *indio_dev)
return 0;
}

static inline ssize_t
ade7758_read_data_from_ring(struct device *dev,
struct device_attribute *attr,
char *buf)
{
return 0;
}

static int ade7758_configure_ring(struct iio_dev *indio_dev)
{
return 0;
Expand Down
173 changes: 89 additions & 84 deletions drivers/staging/iio/meter/ade7758_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@

#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
#include "meter.h"
#include "ade7758.h"

static int ade7758_spi_write_reg_8(struct device *dev,
int ade7758_spi_write_reg_8(struct device *dev,
u8 reg_address,
u8 val)
{
Expand Down Expand Up @@ -490,7 +491,7 @@ static int ade7758_initial_setup(struct ade7758_state *st)
struct device *dev = &st->indio_dev->dev;

/* use low spi speed for init */
st->us->mode = SPI_MODE_3;
st->us->mode = SPI_MODE_1;
spi_setup(st->us);

/* Disable IRQ */
Expand Down Expand Up @@ -580,63 +581,6 @@ static ssize_t ade7758_write_frequency(struct device *dev,
return ret ? ret : len;
}

static ssize_t ade7758_read_waveform_type(struct device *dev,
struct device_attribute *attr,
char *buf)
{
int ret, len = 0;
u8 t;
ret = ade7758_spi_read_reg_8(dev,
ADE7758_WAVMODE,
&t);
if (ret)
return ret;

t = (t >> 2) & 0x7;

len = sprintf(buf, "%d\n", t);

return len;
}

static ssize_t ade7758_write_waveform_type(struct device *dev,
struct device_attribute *attr,
const char *buf,
size_t len)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
unsigned long val;
int ret;
u8 reg;

ret = strict_strtol(buf, 10, &val);
if (ret)
return ret;

if (val > 4)
return -EINVAL;

mutex_lock(&indio_dev->mlock);

ret = ade7758_spi_read_reg_8(dev,
ADE7758_WAVMODE,
&reg);
if (ret)
goto out;

reg &= ~(7 << 2);
reg |= val << 2;

ret = ade7758_spi_write_reg_8(dev,
ADE7758_WAVMODE,
reg);

out:
mutex_unlock(&indio_dev->mlock);

return ret ? ret : len;
}

static IIO_DEV_ATTR_TEMP_RAW(ade7758_read_8bit);
static IIO_CONST_ATTR(temp_offset, "129 C");
static IIO_CONST_ATTR(temp_scale, "4 C");
Expand Down Expand Up @@ -664,19 +608,6 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
ade7758_read_frequency,
ade7758_write_frequency);

/**
* IIO_DEV_ATTR_WAVEFORM_TYPE - set the type of waveform.
* @_mode: sysfs file mode/permissions
* @_show: output method for the attribute
* @_store: input method for the attribute
**/
#define IIO_DEV_ATTR_WAVEFORM_TYPE(_mode, _show, _store) \
IIO_DEVICE_ATTR(waveform_type, _mode, _show, _store, 0)

static IIO_DEV_ATTR_WAVEFORM_TYPE(S_IWUSR | S_IRUGO,
ade7758_read_waveform_type,
ade7758_write_waveform_type);

static IIO_DEV_ATTR_RESET(ade7758_write_reset);

static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26040 13020 6510 3255");
Expand All @@ -686,7 +617,6 @@ static struct attribute *ade7758_attributes[] = {
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_sampling_frequency.dev_attr.attr,
&iio_dev_attr_waveform_type.dev_attr.attr,
&iio_const_attr_sampling_frequency_available.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr,
&iio_dev_attr_awatthr.dev_attr.attr,
Expand Down Expand Up @@ -730,11 +660,73 @@ static const struct attribute_group ade7758_attribute_group = {
.attrs = ade7758_attributes,
};


static struct iio_chan_spec ade7758_channels[] = {
IIO_CHAN(IIO_IN, 0, 1, 0, "raw", 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
0, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
1, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
2, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
3, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
4, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_IN, 0, 1, 0, "raw", 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
5, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
6, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
7, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
8, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
9, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_IN, 0, 1, 0, "raw", 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
10, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
11, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
12, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
13, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
14, IIO_ST('s', 24, 32, 0), 0),
IIO_CHAN_SOFT_TIMESTAMP(15),
};

static int __devinit ade7758_probe(struct spi_device *spi)
{
int ret, regdone = 0;
int i, ret, regdone = 0;
struct ade7758_state *st = kzalloc(sizeof *st, GFP_KERNEL);
if (!st) {
ret = -ENOMEM;
Expand All @@ -755,6 +747,7 @@ static int __devinit ade7758_probe(struct spi_device *spi)
goto error_free_rx;
}
st->us = spi;
st->ade7758_ring_channels = &ade7758_channels[0];
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device(0);
Expand All @@ -770,6 +763,11 @@ static int __devinit ade7758_probe(struct spi_device *spi)
st->indio_dev->driver_module = THIS_MODULE;
st->indio_dev->modes = INDIO_DIRECT_MODE;

for (i = 0; i < AD7758_NUM_WAVESRC; i++)
st->available_scan_masks[i] = 1 << i;

st->indio_dev->available_scan_masks = st->available_scan_masks;

ret = ade7758_configure_ring(st->indio_dev);
if (ret)
goto error_free_dev;
Expand All @@ -779,22 +777,25 @@ static int __devinit ade7758_probe(struct spi_device *spi)
goto error_unreg_ring_funcs;
regdone = 1;

ret = ade7758_initialize_ring(st->indio_dev->ring);
ret = iio_ring_buffer_register_ex(st->indio_dev->ring, 0,
&ade7758_channels[0],
ARRAY_SIZE(ade7758_channels));
if (ret) {
printk(KERN_ERR "failed to initialize the ring\n");
dev_err(&spi->dev, "failed to initialize the ring\n");
goto error_unreg_ring_funcs;
}

/* Get the device into a sane initial state */
ret = ade7758_initial_setup(st);
if (ret)
goto error_uninitialize_ring;

if (spi->irq) {
ret = ade7758_probe_trigger(st->indio_dev);
if (ret)
goto error_uninitialize_ring;
goto error_remove_trigger;
}

/* Get the device into a sane initial state */
ret = ade7758_initial_setup(st);
if (ret)
goto error_remove_trigger;
return 0;

error_remove_trigger:
Expand Down Expand Up @@ -829,8 +830,6 @@ static int ade7758_remove(struct spi_device *spi)
if (ret)
goto err_ret;

flush_scheduled_work();

ade7758_remove_trigger(indio_dev);
ade7758_uninitialize_ring(indio_dev->ring);
iio_device_unregister(indio_dev);
Expand All @@ -845,13 +844,19 @@ static int ade7758_remove(struct spi_device *spi)
return ret;
}

static const struct spi_device_id ade7758_id[] = {
{"ade7758", 0},
{}
};

static struct spi_driver ade7758_driver = {
.driver = {
.name = "ade7758",
.owner = THIS_MODULE,
},
.probe = ade7758_probe,
.remove = __devexit_p(ade7758_remove),
.id_table = ade7758_id,
};

static __init int ade7758_init(void)
Expand Down
Loading

0 comments on commit 8a27a02

Please sign in to comment.