Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 236164
b: refs/heads/master
c: 14f9832
h: refs/heads/master
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Mar 1, 2011
1 parent ca1d204 commit f26d284
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 108 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e67875141b263ada64b7c74f0e593b6686ea8ed
refs/heads/master: 14f983264a74a5734541e094d97a0e681b2f3bb2
31 changes: 0 additions & 31 deletions trunk/drivers/staging/iio/gyro/adis16060.h
View file

This file was deleted.

125 changes: 49 additions & 76 deletions trunk/drivers/staging/iio/gyro/adis16060_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,41 @@
* Licensed under the GPL-2 or later.
*/

#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
#include <linux/list.h>


#include "../iio.h"
#include "../sysfs.h"
#include "gyro.h"
#include "../adc/adc.h"

#include "adis16060.h"
#define ADIS16060_GYRO 0x20 /* Measure Angular Rate (Gyro) */
#define ADIS16060_TEMP_OUT 0x10 /* Measure Temperature */
#define ADIS16060_AIN2 0x80 /* Measure AIN2 */
#define ADIS16060_AIN1 0x40 /* Measure AIN1 */

/**
* struct adis16060_state - device instance specific data
* @us_w: actual spi_device to write config
* @us_r: actual spi_device to read back data
* @indio_dev: industrial I/O device structure
* @buf: transmit or recieve buffer
* @buf_lock: mutex to protect tx and rx
**/
struct adis16060_state {
struct spi_device *us_w;
struct spi_device *us_r;
struct iio_dev *indio_dev;
struct mutex buf_lock;

u8 buf[3] ____cacheline_aligned;
};

static struct adis16060_state *adis16060_st;

Expand All @@ -35,11 +52,8 @@ static int adis16060_spi_write(struct device *dev,
struct adis16060_state *st = iio_dev_get_devdata(indio_dev);

mutex_lock(&st->buf_lock);
st->tx[0] = 0;
st->tx[1] = 0;
st->tx[2] = val; /* The last 8 bits clocked in are latched */

ret = spi_write(st->us_w, st->tx, 3);
st->buf[2] = val; /* The last 8 bits clocked in are latched */
ret = spi_write(st->us_w, st->buf, 3);
mutex_unlock(&st->buf_lock);

return ret;
Expand All @@ -54,17 +68,17 @@ static int adis16060_spi_read(struct device *dev,

mutex_lock(&st->buf_lock);

ret = spi_read(st->us_r, st->rx, 3);
ret = spi_read(st->us_r, st->buf, 3);

/* The internal successive approximation ADC begins the
* conversion process on the falling edge of MSEL1 and
* starts to place data MSB first on the DOUT line at
* the 6th falling edge of SCLK
*/
if (ret == 0)
*val = ((st->rx[0] & 0x3) << 12) |
(st->rx[1] << 4) |
((st->rx[2] >> 4) & 0xF);
*val = ((st->buf[0] & 0x3) << 12) |
(st->buf[1] << 4) |
((st->buf[2] >> 4) & 0xF);
mutex_unlock(&st->buf_lock);

return ret;
Expand All @@ -74,13 +88,19 @@ static ssize_t adis16060_read(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
struct iio_dev *indio_dev = dev_get_drvdata(dev);
u16 val = 0;
ssize_t ret;

/* Take the iio_dev status lock */
mutex_lock(&indio_dev->mlock);
ret = adis16060_spi_read(dev, &val);

ret = adis16060_spi_write(dev, this_attr->address);
if (ret < 0)
goto error_ret;
ret = adis16060_spi_read(dev, &val);
error_ret:
mutex_unlock(&indio_dev->mlock);

if (ret == 0)
Expand All @@ -89,45 +109,22 @@ static ssize_t adis16060_read(struct device *dev,
return ret;
}

static ssize_t adis16060_write(struct device *dev,
struct device_attribute *attr,
const char *buf,
size_t len)
{
int ret;
long val;

ret = strict_strtol(buf, 16, &val);
if (ret)
goto error_ret;
ret = adis16060_spi_write(dev, val);

error_ret:
return ret ? ret : len;
}

#define IIO_DEV_ATTR_IN(_show) \
IIO_DEVICE_ATTR(in, S_IRUGO, _show, NULL, 0)

#define IIO_DEV_ATTR_OUT(_store) \
IIO_DEVICE_ATTR(out, S_IRUGO, NULL, _store, 0)

static IIO_DEV_ATTR_IN(adis16060_read);
static IIO_DEV_ATTR_OUT(adis16060_write);

static IIO_DEV_ATTR_GYRO_Z(adis16060_read, ADIS16060_GYRO);
static IIO_DEVICE_ATTR(temp_raw, S_IRUGO, adis16060_read, NULL,
ADIS16060_TEMP_OUT);
static IIO_CONST_ATTR_TEMP_SCALE("34"); /* Milli degrees C */
static IIO_CONST_ATTR_TEMP_OFFSET("-7461.117"); /* Milli degrees C */
static IIO_DEV_ATTR_IN_RAW(0, adis16060_read, ADIS16060_AIN1);
static IIO_DEV_ATTR_IN_RAW(1, adis16060_read, ADIS16060_AIN2);
static IIO_CONST_ATTR(name, "adis16060");

static struct attribute *adis16060_event_attributes[] = {
NULL
};

static struct attribute_group adis16060_event_attribute_group = {
.attrs = adis16060_event_attributes,
};

static struct attribute *adis16060_attributes[] = {
&iio_dev_attr_in.dev_attr.attr,
&iio_dev_attr_out.dev_attr.attr,
&iio_dev_attr_gyro_z_raw.dev_attr.attr,
&iio_dev_attr_temp_raw.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_dev_attr_in0_raw.dev_attr.attr,
&iio_dev_attr_in1_raw.dev_attr.attr,
&iio_const_attr_name.dev_attr.attr,
NULL
};
Expand All @@ -147,29 +144,16 @@ static int __devinit adis16060_r_probe(struct spi_device *spi)
/* this is only used for removal purposes */
spi_set_drvdata(spi, st);

/* Allocate the comms buffers */
st->rx = kzalloc(sizeof(*st->rx)*ADIS16060_MAX_RX, GFP_KERNEL);
if (st->rx == NULL) {
ret = -ENOMEM;
goto error_free_st;
}
st->tx = kzalloc(sizeof(*st->tx)*ADIS16060_MAX_TX, GFP_KERNEL);
if (st->tx == NULL) {
ret = -ENOMEM;
goto error_free_rx;
}
st->us_r = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
goto error_free_st;
}

st->indio_dev->dev.parent = &spi->dev;
st->indio_dev->num_interrupt_lines = 1;
st->indio_dev->event_attrs = &adis16060_event_attribute_group;
st->indio_dev->attrs = &adis16060_attribute_group;
st->indio_dev->dev_data = (void *)(st);
st->indio_dev->driver_module = THIS_MODULE;
Expand All @@ -188,10 +172,6 @@ static int __devinit adis16060_r_probe(struct spi_device *spi)
iio_device_unregister(st->indio_dev);
else
iio_free_device(st->indio_dev);
error_free_tx:
kfree(st->tx);
error_free_rx:
kfree(st->rx);
error_free_st:
kfree(st);
error_ret:
Expand All @@ -204,14 +184,7 @@ static int adis16060_r_remove(struct spi_device *spi)
struct adis16060_state *st = spi_get_drvdata(spi);
struct iio_dev *indio_dev = st->indio_dev;

flush_scheduled_work();

if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
iio_unregister_interrupt_line(indio_dev, 0);

iio_device_unregister(indio_dev);
kfree(st->tx);
kfree(st->rx);
kfree(st);

return 0;
Expand Down

0 comments on commit f26d284

Please sign in to comment.